varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysprof: fix various GTK deprecations

Browse Source
This commit is contained in:
Christian Hergert
2024-10-02 12:55:08 -07:00
parent c0cd6037ba
commit 92a1179982
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/sysprof/sysprof-time-scrubber.c
View File

@ -101,19 +101,20 @@ set_motion (SysprofTimeScrubber *self,
{ {
g_autoptr(GObject) item = NULL; g_autoptr(GObject) item = NULL;
g_autofree char *text = NULL; g_autofree char *text = NULL;
double layer_x; graphene_point_t point;
double layer_y;
gtk_widget_translate_coordinates (GTK_WIDGET (self), if (!gtk_widget_compute_point (GTK_WIDGET (self),
GTK_WIDGET (layer), GTK_WIDGET (layer),
x, y, &layer_x, &layer_y); &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))) gtk_label_set_label (self->informative, text);
text = _sysprof_session_describe (self->session, item);
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) GtkGestureDrag *drag)
{ {
graphene_rect_t zoom_area; graphene_rect_t zoom_area;
double x, y; graphene_point_t point;
g_assert (SYSPROF_IS_TIME_SCRUBBER (self)); g_assert (SYSPROF_IS_TIME_SCRUBBER (self));
g_assert (GTK_IS_GESTURE_DRAG (drag)); g_assert (GTK_IS_GESTURE_DRAG (drag));
gtk_widget_translate_coordinates (GTK_WIDGET (self->zoom), if (!gtk_widget_compute_point (GTK_WIDGET (self->zoom),
GTK_WIDGET (self), GTK_WIDGET (self),
0, 0, &x, &y); &GRAPHENE_POINT_INIT (0, 0),
zoom_area = GRAPHENE_RECT_INIT (x, y, &point))
return;
zoom_area = GRAPHENE_RECT_INIT (point.x, point.y,
gtk_widget_get_width (GTK_WIDGET (self->zoom)), gtk_widget_get_width (GTK_WIDGET (self->zoom)),
gtk_widget_get_height (GTK_WIDGET (self->zoom))); gtk_widget_get_height (GTK_WIDGET (self->zoom)));

12
src/sysprof/sysprof-tree-expander.c
View File

@ -172,10 +172,16 @@ expander_contains_point (SysprofTreeExpander *self,
double x, double x,
double y) double y)
{ {
gtk_widget_translate_coordinates (GTK_WIDGET (self), GTK_WIDGET (self->expander), graphene_point_t point;
x, y, &x, &y);
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 FALSE;
return TRUE; return TRUE;