AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

testzoom: Fix the in-place rotate

Browse Source
This commit is contained in:
Matthias Clasen 2021-05-13 18:58:34 -04:00
parent 889bf83020
commit c391cf38e2
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/testzoom.c
View File

@ -51,13 +51,23 @@ update_transform (GtkZoom *zoom)
GtkLayoutManager *manager; GtkLayoutManager *manager;
GtkLayoutChild *child; GtkLayoutChild *child;
GskTransform *transform; GskTransform *transform;
int w, h;
int x, y;
manager = gtk_widget_get_layout_manager (GTK_WIDGET (zoom)); manager = gtk_widget_get_layout_manager (GTK_WIDGET (zoom));
child = gtk_layout_manager_get_layout_child (manager, zoom->child); child = gtk_layout_manager_get_layout_child (manager, zoom->child);
w = gtk_widget_get_width (GTK_WIDGET (zoom));
h = gtk_widget_get_height (GTK_WIDGET (zoom));
x = gtk_widget_get_allocated_width (GTK_WIDGET (zoom->child));
y = gtk_widget_get_allocated_height (GTK_WIDGET (zoom->child));
transform = NULL; transform = NULL;
transform = gsk_transform_rotate (transform, zoom->angle); transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w/2, h/2));
transform = gsk_transform_scale (transform, zoom->scale, zoom->scale); transform = gsk_transform_scale (transform, zoom->scale, zoom->scale);
transform = gsk_transform_rotate (transform, zoom->angle);
transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (-x/2, -y/2));
gtk_fixed_layout_child_set_transform (GTK_FIXED_LAYOUT_CHILD (child), transform); gtk_fixed_layout_child_set_transform (GTK_FIXED_LAYOUT_CHILD (child), transform);
gsk_transform_unref (transform); gsk_transform_unref (transform);
} }
@ -107,6 +117,8 @@ gtk_zoom_set_child (GtkZoom *zoom,
if (zoom->child) if (zoom->child)
gtk_widget_set_parent (zoom->child, GTK_WIDGET (zoom)); gtk_widget_set_parent (zoom->child, GTK_WIDGET (zoom));
update_transform (zoom);
g_object_notify_by_pspec (G_OBJECT (zoom), props[PROP_CHILD]); g_object_notify_by_pspec (G_OBJECT (zoom), props[PROP_CHILD]);
} }
@ -199,6 +211,22 @@ gtk_zoom_new (void)
return g_object_new (gtk_zoom_get_type (), NULL); return g_object_new (gtk_zoom_get_type (), NULL);
} }
static gboolean
update_transform_once (GtkWidget *widget,
GdkFrameClock *frame_clock,
gpointer data)
{
static int count = 0;
update_transform ((GtkZoom *)widget);
count++;
if (count == 2)
return G_SOURCE_REMOVE;
return G_SOURCE_CONTINUE;
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -206,7 +234,6 @@ main (int argc, char *argv[])
GtkWidget *zoom; GtkWidget *zoom;
GtkWidget *box; GtkWidget *box;
GtkWidget *grid; GtkWidget *grid;
GtkWidget *sw;
GtkWidget *scale; GtkWidget *scale;
GtkWidget *angle; GtkWidget *angle;
GtkWidget *child; GtkWidget *child;
@ -236,15 +263,10 @@ main (int argc, char *argv[])
gtk_grid_attach (GTK_GRID (grid), angle, 1, 1, 1, 1); gtk_grid_attach (GTK_GRID (grid), angle, 1, 1, 1, 1);
gtk_box_append (GTK_BOX (box), grid); gtk_box_append (GTK_BOX (box), grid);
sw = gtk_scrolled_window_new ();
gtk_widget_set_hexpand (sw, TRUE);
gtk_widget_set_vexpand (sw, TRUE);
gtk_box_append (GTK_BOX (box), sw);
zoom = gtk_zoom_new (); zoom = gtk_zoom_new ();
gtk_widget_set_halign (zoom, GTK_ALIGN_CENTER); gtk_widget_set_hexpand (zoom, TRUE);
gtk_widget_set_valign (zoom, GTK_ALIGN_CENTER); gtk_widget_set_vexpand (zoom, TRUE);
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), zoom); gtk_box_append (GTK_BOX (box), zoom);
adjustment = gtk_range_get_adjustment (GTK_RANGE (scale)); adjustment = gtk_range_get_adjustment (GTK_RANGE (scale));
g_object_bind_property (adjustment, "value", g_object_bind_property (adjustment, "value",
@ -269,6 +291,9 @@ main (int argc, char *argv[])
gtk_window_present (window); gtk_window_present (window);
/* HACK to get the transform initally updated */
gtk_widget_add_tick_callback (zoom, update_transform_once, NULL, NULL);
while (g_list_model_get_n_items (gtk_window_get_toplevels ()) > 0) while (g_list_model_get_n_items (gtk_window_get_toplevels ()) > 0)
g_main_context_iteration (NULL, TRUE); g_main_context_iteration (NULL, TRUE);