[gtk/offscreen-fixes: 1/3] testzoom: Fix the in-place rotate
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/offscreen-fixes: 1/3] testzoom: Fix the in-place rotate
- Date: Thu, 13 May 2021 23:37:45 +0000 (UTC)
commit c391cf38e26cdbeebbd77310255ed1b59d7149d2
Author: Matthias Clasen <mclasen redhat com>
Date: Thu May 13 18:58:34 2021 -0400
testzoom: Fix the in-place rotate
tests/testzoom.c | 45 +++++++++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/tests/testzoom.c b/tests/testzoom.c
index 2465ce2cb3..f41dbee9b7 100644
--- a/tests/testzoom.c
+++ b/tests/testzoom.c
@@ -51,13 +51,23 @@ update_transform (GtkZoom *zoom)
GtkLayoutManager *manager;
GtkLayoutChild *child;
GskTransform *transform;
+ int w, h;
+ int x, y;
manager = gtk_widget_get_layout_manager (GTK_WIDGET (zoom));
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 = 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_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);
gsk_transform_unref (transform);
}
@@ -107,6 +117,8 @@ gtk_zoom_set_child (GtkZoom *zoom,
if (zoom->child)
gtk_widget_set_parent (zoom->child, GTK_WIDGET (zoom));
+ update_transform (zoom);
+
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);
}
+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
main (int argc, char *argv[])
{
@@ -206,7 +234,6 @@ main (int argc, char *argv[])
GtkWidget *zoom;
GtkWidget *box;
GtkWidget *grid;
- GtkWidget *sw;
GtkWidget *scale;
GtkWidget *angle;
GtkWidget *child;
@@ -236,15 +263,10 @@ main (int argc, char *argv[])
gtk_grid_attach (GTK_GRID (grid), angle, 1, 1, 1, 1);
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 ();
- gtk_widget_set_halign (zoom, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (zoom, GTK_ALIGN_CENTER);
- gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), zoom);
+ gtk_widget_set_hexpand (zoom, TRUE);
+ gtk_widget_set_vexpand (zoom, TRUE);
+ gtk_box_append (GTK_BOX (box), zoom);
adjustment = gtk_range_get_adjustment (GTK_RANGE (scale));
g_object_bind_property (adjustment, "value",
@@ -269,6 +291,9 @@ main (int argc, char *argv[])
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)
g_main_context_iteration (NULL, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]