diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-09-26 14:00:32 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-26 14:00:32 +0000 |
commit | 34ec226852d8f670270ba5002e85c8791b1e6435 (patch) | |
tree | 3fffd6e04585b6471fe39b28f9e01cdca4b1b192 | |
parent | 54944c9cea983669c571861e0ca15f25d0e4b8c3 (diff) | |
parent | d56ad7c40cfa971d24fc093d99163d270d19b226 (diff) | |
download | gtk+-34ec226852d8f670270ba5002e85c8791b1e6435.tar.gz |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2626
-rw-r--r-- | NEWS | 13 | ||||
-rw-r--r-- | tests/meson.build | 1 | ||||
-rw-r--r-- | tests/testupload.c | 277 |
3 files changed, 291 insertions, 0 deletions
@@ -35,6 +35,7 @@ Overview of Changes in GTK 3.99.2 * GtkFontChooser: - Determine sample text based on font coverage - Allow filtering by language + - Don't center the list * GtkStack: - Add gtk_stack_add_child @@ -42,8 +43,12 @@ Overview of Changes in GTK 3.99.2 * GtkVideo: - Make autoplay work +* GtkButton: + - Check coordinates for button releases + * CSS: - Allow more than 64 selectors per rule + - Avoid some allocation overhead * Adwaita: - Improve gesture graphics @@ -52,6 +57,8 @@ Overview of Changes in GTK 3.99.2 * GDK: - Add gdk_frame_clock_get_fps + - GLES: Fix color channel mixup in textures + - GL: Reduce image copying for texture uploads * GSK: - Add radial gradient nodes @@ -76,6 +83,12 @@ Overview of Changes in GTK 3.99.2 - Rename GdkSurfaceState to GdkToplevelState - Remove GdkWaylandSurface::committed - Make Wayland backend api take GdkToplevel + - Drop gtk_widget_new + - Drop cairo_surface_upload_to_gl + - Drop gtk_scrolled_window_set_capture_button_press + - Drop gtk_column_view_column_new_with_factory + - Rename gtk_buildable_set_name to gtk_buildable_set_buildable_id + - Drop other GtkBuildable api * Demos: - Bug and crash fixes diff --git a/tests/meson.build b/tests/meson.build index 17300c85b8..99f95009f0 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,5 +1,6 @@ gtk_tests = [ # testname, optional extra sources + ['testupload'], ['testtransform'], ['testdropdown'], ['rendernode'], diff --git a/tests/testupload.c b/tests/testupload.c new file mode 100644 index 0000000000..747c94211f --- /dev/null +++ b/tests/testupload.c @@ -0,0 +1,277 @@ +#include <gtk/gtk.h> + +static void +add_to_grid (GtkWidget *grid, + int left, + int top, + int n_channels, + gboolean premul, + int width, + int height, + int stride, + GtkWidget *picture) +{ + char *text; + + gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Channels"), left, top, 1, 1); + gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Width"), left, top + 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Height"), left, top + 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Stride"), left, top + 3, 1, 1); + + text = g_strdup_printf ("%d%s", n_channels, premul ? " (premul)" : ""); + gtk_grid_attach (GTK_GRID (grid), gtk_label_new (text), left + 1, top, 1, 1); + g_free (text); + text = g_strdup_printf ("%d", width); + gtk_grid_attach (GTK_GRID (grid), gtk_label_new (text), left + 1, top + 1, 1, 1); + g_free (text); + text = g_strdup_printf ("%d", height); + gtk_grid_attach (GTK_GRID (grid), gtk_label_new (text), left + 1, top + 2, 1, 1); + g_free (text); + text = g_strdup_printf ("%d", stride); + gtk_grid_attach (GTK_GRID (grid), gtk_label_new (text), left + 1, top + 3, 1, 1); + g_free (text); + + gtk_grid_attach (GTK_GRID (grid), picture, left + 2, top + 0, 1, 4); +} + +int +main (int argc, char *argv[]) +{ + GtkWidget *window, *grid; + GdkPixbuf *source, *pb, *pb2; + GError *error = NULL; + cairo_t *cr; + cairo_surface_t *surface; + GBytes *bytes; + GdkTexture *texture; + + gtk_init (); + + window = gtk_window_new (); + grid = gtk_grid_new (); + gtk_widget_set_margin_top (grid, 10); + gtk_widget_set_margin_bottom (grid, 10); + gtk_widget_set_margin_start (grid, 10); + gtk_widget_set_margin_end (grid, 10); + gtk_grid_set_row_spacing (GTK_GRID (grid), 10); + gtk_grid_set_column_spacing (GTK_GRID (grid), 10); + gtk_window_set_child (GTK_WINDOW (window), grid); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 200, 200, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + add_to_grid (grid, 0, 0, + gdk_pixbuf_get_n_channels (source), + FALSE, + gdk_pixbuf_get_width (source), + gdk_pixbuf_get_height (source), + gdk_pixbuf_get_rowstride (source), + gtk_picture_new_for_pixbuf (source)); + + g_object_unref (source); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 199, 199, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + add_to_grid (grid, 4, 0, + gdk_pixbuf_get_n_channels (source), + FALSE, + gdk_pixbuf_get_width (source), + gdk_pixbuf_get_height (source), + gdk_pixbuf_get_rowstride (source), + gtk_picture_new_for_pixbuf (source)); + + g_object_unref (source); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 201, 201, TRUE, + &error); + + if (!source) + g_error ("%s", error->message); + + pb = gdk_pixbuf_new_subpixbuf (source, 0, 0, 200, 200); + + add_to_grid (grid, 8, 0, + gdk_pixbuf_get_n_channels (pb), + FALSE, + gdk_pixbuf_get_width (pb), + gdk_pixbuf_get_height (pb), + gdk_pixbuf_get_rowstride (pb), + gtk_picture_new_for_pixbuf (pb)); + + g_object_unref (source); + g_object_unref (pb); + + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 200, 200, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + pb = gdk_pixbuf_add_alpha (source, FALSE, 0, 0, 0); + + add_to_grid (grid, 0, 5, + gdk_pixbuf_get_n_channels (pb), + FALSE, + gdk_pixbuf_get_width (pb), + gdk_pixbuf_get_height (pb), + gdk_pixbuf_get_rowstride (pb), + gtk_picture_new_for_pixbuf (pb)); + + g_object_unref (source); + g_object_unref (pb); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 199, 199, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + pb = gdk_pixbuf_add_alpha (source, FALSE, 0, 0, 0); + + add_to_grid (grid, 4, 5, + gdk_pixbuf_get_n_channels (pb), + FALSE, + gdk_pixbuf_get_width (pb), + gdk_pixbuf_get_height (pb), + gdk_pixbuf_get_rowstride (pb), + gtk_picture_new_for_pixbuf (pb)); + + g_object_unref (source); + g_object_unref (pb); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 201, 201, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + pb = gdk_pixbuf_add_alpha (source, FALSE, 0, 0, 0); + pb2 = gdk_pixbuf_new_subpixbuf (pb, 0, 0, 200, 200); + + add_to_grid (grid, 8, 5, + gdk_pixbuf_get_n_channels (pb2), + FALSE, + gdk_pixbuf_get_width (pb2), + gdk_pixbuf_get_height (pb2), + gdk_pixbuf_get_rowstride (pb2), + gtk_picture_new_for_pixbuf (pb2)); + + g_object_unref (source); + g_object_unref (pb); + g_object_unref (pb2); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 200, 200, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + pb = gdk_pixbuf_add_alpha (source, FALSE, 0, 0, 0); + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, gdk_pixbuf_get_width (pb), gdk_pixbuf_get_height (pb)); + cr = cairo_create (surface); + gdk_cairo_set_source_pixbuf (cr, pb, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + bytes = g_bytes_new (cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface) * + cairo_image_surface_get_height (surface)); + texture = gdk_memory_texture_new (cairo_image_surface_get_width (surface), + cairo_image_surface_get_height (surface), + GDK_MEMORY_DEFAULT, + bytes, + cairo_image_surface_get_stride (surface)); + g_bytes_unref (bytes); + + add_to_grid (grid, 0, 10, + 4, TRUE, + cairo_image_surface_get_width (surface), + cairo_image_surface_get_height (surface), + cairo_image_surface_get_stride (surface), + gtk_picture_new_for_paintable (GDK_PAINTABLE (texture))); + + g_object_unref (source); + g_object_unref (pb); + cairo_surface_destroy (surface); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 199, 199, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + pb = gdk_pixbuf_add_alpha (source, FALSE, 0, 0, 0); + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, gdk_pixbuf_get_width (pb), gdk_pixbuf_get_height (pb)); + cr = cairo_create (surface); + gdk_cairo_set_source_pixbuf (cr, pb, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + bytes = g_bytes_new (cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface) * + cairo_image_surface_get_height (surface)); + texture = gdk_memory_texture_new (cairo_image_surface_get_width (surface), + cairo_image_surface_get_height (surface), + GDK_MEMORY_DEFAULT, + bytes, + cairo_image_surface_get_stride (surface)); + g_bytes_unref (bytes); + + add_to_grid (grid, 4, 10, + 4, TRUE, + cairo_image_surface_get_width (surface), + cairo_image_surface_get_height (surface), + cairo_image_surface_get_stride (surface), + gtk_picture_new_for_paintable (GDK_PAINTABLE (texture))); + + g_object_unref (source); + g_object_unref (pb); + cairo_surface_destroy (surface); + + source = gdk_pixbuf_new_from_file_at_scale ("tests/portland-rose.jpg", + 201, 201, TRUE, + &error); + if (!source) + g_error ("%s", error->message); + + pb = gdk_pixbuf_add_alpha (source, FALSE, 0, 0, 0); + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, gdk_pixbuf_get_width (pb), gdk_pixbuf_get_height (pb)); + cr = cairo_create (surface); + gdk_cairo_set_source_pixbuf (cr, pb, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + bytes = g_bytes_new (cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface) * + cairo_image_surface_get_height (surface)); + texture = gdk_memory_texture_new (cairo_image_surface_get_width (surface) - 1, + cairo_image_surface_get_height (surface) - 1, + GDK_MEMORY_DEFAULT, + bytes, + cairo_image_surface_get_stride (surface)); + g_bytes_unref (bytes); + + add_to_grid (grid, 8, 10, + 4, TRUE, + gdk_texture_get_width (texture), + gdk_texture_get_height (texture), + cairo_image_surface_get_stride (surface), + gtk_picture_new_for_paintable (GDK_PAINTABLE (texture))); + + g_object_unref (source); + g_object_unref (pb); + cairo_surface_destroy (surface); + + gtk_window_present (GTK_WINDOW (window)); + + while (g_list_model_get_n_items (gtk_window_get_toplevels ()) > 0) + g_main_context_iteration (NULL, TRUE); + + return 0; +} |