callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'work/gtk-3-24' into 'gtk-3-24'

Browse Source 
gesture: set widget x and y if coordinate translation between widgets fails

See merge request GNOME/gtk!7513
This commit is contained in:
Matthias Clasen 2024-08-16 17:35:00 +00:00
commit 8e6cc9b5c9
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkgesture.c
View File

@ -125,6 +125,7 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include <math.h>
typedef struct _GtkGesturePrivate GtkGesturePrivate; typedef struct _GtkGesturePrivate GtkGesturePrivate;
typedef struct _PointData PointData; typedef struct _PointData PointData;
@ -472,7 +473,7 @@ _update_widget_coordinates (GtkGesture *gesture,
GtkWidget *event_widget, *widget; GtkWidget *event_widget, *widget;
GtkAllocation allocation; GtkAllocation allocation;
gdouble event_x, event_y; gdouble event_x, event_y;
gint wx, wy, x, y; gint x, y;
event_widget = gtk_get_event_widget (data->event); event_widget = gtk_get_event_widget (data->event);
@ -486,6 +487,7 @@ _update_widget_coordinates (GtkGesture *gesture,
while (window && window != event_widget_window) while (window && window != event_widget_window)
{ {
gint wx, wy;
gdk_window_get_position (window, &wx, &wy); gdk_window_get_position (window, &wx, &wy);
event_x += wx; event_x += wx;
event_y += wy; event_y += wy;
@ -502,13 +504,20 @@ _update_widget_coordinates (GtkGesture *gesture,
event_y -= allocation.y; event_y -= allocation.y;
} }
gtk_widget_translate_coordinates (event_widget, widget, if (gtk_widget_translate_coordinates (event_widget, widget,
event_x, event_y, &x, &y); event_x, event_y, &x, &y))
/* gtk_widget_translate() loses the fractional part so we need to {
* add it back to not lose accuracy */ /* gtk_widget_translate() loses the fractional part so we need to
data->widget_x = x + (event_x - (int)event_x); * add it back to not lose accuracy */
data->widget_y = y + (event_y - (int)event_y); data->widget_x = x + (event_x - (int)event_x);
data->widget_y = y + (event_y - (int)event_y);
}
else
{
/* Mark the coordinates well outside the widget, to
* signal that the translation has failed */
data->widget_x = data->widget_y = NAN;
}
} }
static GtkEventSequenceState static GtkEventSequenceState