From 92a11799822ea3d26edea27ffe8ee4f7e270057a Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Wed, 2 Oct 2024 12:55:08 -0700
Subject: [PATCH] sysprof: fix various GTK deprecations

---
 src/sysprof/sysprof-time-scrubber.c | 34 ++++++++++++++++-------------
 src/sysprof/sysprof-tree-expander.c | 12 +++++++---
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/sysprof/sysprof-time-scrubber.c b/src/sysprof/sysprof-time-scrubber.c
index c659695a..61eeb15c 100644
--- a/src/sysprof/sysprof-time-scrubber.c
+++ b/src/sysprof/sysprof-time-scrubber.c
@@ -101,19 +101,20 @@ set_motion (SysprofTimeScrubber *self,
         {
           g_autoptr(GObject) item = NULL;
           g_autofree char *text = NULL;
-          double layer_x;
-          double layer_y;
+          graphene_point_t point;
 
-          gtk_widget_translate_coordinates (GTK_WIDGET (self),
-                                            GTK_WIDGET (layer),
-                                            x, y, &layer_x, &layer_y);
+          if (!gtk_widget_compute_point (GTK_WIDGET (self),
+                                         GTK_WIDGET (layer),
+                                         &GRAPHENE_POINT_INIT (x, y),
+                                         &point))
+            {
+              if ((item = sysprof_chart_layer_lookup_item (layer, point.x, point.y)))
+                text = _sysprof_session_describe (self->session, item);
 
-          if ((item = sysprof_chart_layer_lookup_item (layer, layer_x, layer_y)))
-            text = _sysprof_session_describe (self->session, item);
+              gtk_label_set_label (self->informative, text);
 
-          gtk_label_set_label (self->informative, text);
-
-          informative_visible = text != NULL;
+              informative_visible = text != NULL;
+            }
         }
     }
 
@@ -164,15 +165,18 @@ sysprof_time_scrubber_drag_begin_cb (SysprofTimeScrubber *self,
                                      GtkGestureDrag      *drag)
 {
   graphene_rect_t zoom_area;
-  double x, y;
+  graphene_point_t point;
 
   g_assert (SYSPROF_IS_TIME_SCRUBBER (self));
   g_assert (GTK_IS_GESTURE_DRAG (drag));
 
-  gtk_widget_translate_coordinates (GTK_WIDGET (self->zoom),
-                                    GTK_WIDGET (self),
-                                    0, 0, &x, &y);
-  zoom_area = GRAPHENE_RECT_INIT (x, y,
+  if (!gtk_widget_compute_point (GTK_WIDGET (self->zoom),
+                                 GTK_WIDGET (self),
+                                 &GRAPHENE_POINT_INIT (0, 0),
+                                 &point))
+    return;
+
+  zoom_area = GRAPHENE_RECT_INIT (point.x, point.y,
                                   gtk_widget_get_width (GTK_WIDGET (self->zoom)),
                                   gtk_widget_get_height (GTK_WIDGET (self->zoom)));
 
diff --git a/src/sysprof/sysprof-tree-expander.c b/src/sysprof/sysprof-tree-expander.c
index 0da9b6e7..2f1dc223 100644
--- a/src/sysprof/sysprof-tree-expander.c
+++ b/src/sysprof/sysprof-tree-expander.c
@@ -172,10 +172,16 @@ expander_contains_point (SysprofTreeExpander *self,
                          double               x,
                          double               y)
 {
-  gtk_widget_translate_coordinates (GTK_WIDGET (self), GTK_WIDGET (self->expander),
-                                    x, y, &x, &y);
+  graphene_point_t point;
 
-  if (x < 0 || y < 0 || x > gtk_widget_get_width (self->expander) || y > gtk_widget_get_height (self->expander))
+  if (!gtk_widget_compute_point (GTK_WIDGET (self), GTK_WIDGET (self->expander),
+                                 &GRAPHENE_POINT_INIT (x, y), &point))
+    return FALSE;
+
+  if (point.x < 0 ||
+      point.y < 0 ||
+      x > gtk_widget_get_width (self->expander) ||
+      y > gtk_widget_get_height (self->expander))
     return FALSE;
 
   return TRUE;