AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

gestureclick: Use drag threshold for updates

Browse Source
This commit is contained in:
Matthias Clasen 2023-04-07 17:44:27 -04:00
parent c0fa9e80aa
commit 5f4a6210c2
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkgestureclick.c
View File

@ -150,6 +150,7 @@ _gtk_gesture_click_update_timeout (GtkGestureClick *gesture)
static gboolean static gboolean
_gtk_gesture_click_check_within_threshold (GtkGestureClick *gesture, _gtk_gesture_click_check_within_threshold (GtkGestureClick *gesture,
const char *setting,
double x, double x,
double y) double y)
{ {
@ -165,9 +166,7 @@ _gtk_gesture_click_check_within_threshold (GtkGestureClick *gesture,
widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)); widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
settings = gtk_widget_get_settings (widget); settings = gtk_widget_get_settings (widget);
g_object_get (settings, g_object_get (settings, setting, &double_click_distance, NULL);
"gtk-double-click-distance", &double_click_distance,
NULL);
if (ABS (priv->initial_press_x - x) < double_click_distance && if (ABS (priv->initial_press_x - x) < double_click_distance &&
ABS (priv->initial_press_y - y) < double_click_distance) ABS (priv->initial_press_y - y) < double_click_distance)
@ -221,7 +220,7 @@ gtk_gesture_click_begin (GtkGesture *gesture,
gtk_gesture_get_point (gesture, current, &x, &y); gtk_gesture_get_point (gesture, current, &x, &y);
if (gdk_device_get_source (priv->current_device) == GDK_SOURCE_MOUSE && if (gdk_device_get_source (priv->current_device) == GDK_SOURCE_MOUSE &&
!_gtk_gesture_click_check_within_threshold (click, x, y)) !_gtk_gesture_click_check_within_threshold (click, "gtk-double-click-distance", x, y))
_gtk_gesture_click_stop (click); _gtk_gesture_click_stop (click);
/* Increment later the real counter, just if the gesture is /* Increment later the real counter, just if the gesture is
@ -244,17 +243,14 @@ gtk_gesture_click_update (GtkGesture *gesture,
GdkEventSequence *sequence) GdkEventSequence *sequence)
{ {
GtkGestureClick *click; GtkGestureClick *click;
GtkGestureClickPrivate *priv;
GdkEventSequence *current; GdkEventSequence *current;
double x, y; double x, y;
click = GTK_GESTURE_CLICK (gesture); click = GTK_GESTURE_CLICK (gesture);
priv = gtk_gesture_click_get_instance_private (click);
current = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); current = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
gtk_gesture_get_point (gesture, current, &x, &y); gtk_gesture_get_point (gesture, current, &x, &y);
if (gdk_device_get_source (priv->current_device) == GDK_SOURCE_MOUSE && if (!_gtk_gesture_click_check_within_threshold (click, "gtk-dnd-drag-threshold", x, y))
!_gtk_gesture_click_check_within_threshold (click, x, y))
_gtk_gesture_click_stop (click); _gtk_gesture_click_stop (click);
} }