AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkgesture: Do not update gestures with mismatching n-points on touchpad

Browse Source 
Check that the touchpad gesture event has a matching number of fingers before
updating the GtkGesture point tracking, instead of afterwards. Avoids pointless
tracking of these touchpad events when we know beforehand that the gesture
will never be activated by the touchpad events.

Related: https://gitlab.gnome.org/GNOME/gtk/-/issues/5199
This commit is contained in:
Carlos Garnacho 2022-09-23 13:45:46 +02:00
parent d351cbbcea
commit 872534e763
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkgesture.c
View File

@ -640,9 +640,9 @@ gtk_gesture_handle_event (GtkEventController *controller,
if (event_type == GDK_BUTTON_PRESS || if (event_type == GDK_BUTTON_PRESS ||
event_type == GDK_TOUCH_BEGIN || event_type == GDK_TOUCH_BEGIN ||
(event_type == GDK_TOUCHPAD_SWIPE && phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN) || (EVENT_IS_TOUCHPAD_GESTURE (event) &&
(event_type == GDK_TOUCHPAD_PINCH && phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN) || phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN &&
(event_type == GDK_TOUCHPAD_HOLD && phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN)) gdk_touchpad_event_get_n_fingers (event) == priv->n_points))
{ {
if (_gtk_gesture_update_point (gesture, event, target, x, y, TRUE)) if (_gtk_gesture_update_point (gesture, event, target, x, y, TRUE))
{ {
@ -673,9 +673,9 @@ gtk_gesture_handle_event (GtkEventController *controller,
} }
else if (event_type == GDK_BUTTON_RELEASE || else if (event_type == GDK_BUTTON_RELEASE ||
event_type == GDK_TOUCH_END || event_type == GDK_TOUCH_END ||
(event_type == GDK_TOUCHPAD_SWIPE && phase == GDK_TOUCHPAD_GESTURE_PHASE_END) || (EVENT_IS_TOUCHPAD_GESTURE (event) &&
(event_type == GDK_TOUCHPAD_PINCH && phase == GDK_TOUCHPAD_GESTURE_PHASE_END) || phase == GDK_TOUCHPAD_GESTURE_PHASE_END &&
(event_type == GDK_TOUCHPAD_HOLD && phase == GDK_TOUCHPAD_GESTURE_PHASE_END)) gdk_touchpad_event_get_n_fingers (event) == priv->n_points))
{ {
gboolean was_claimed = FALSE; gboolean was_claimed = FALSE;
@ -695,8 +695,9 @@ gtk_gesture_handle_event (GtkEventController *controller,
} }
else if (event_type == GDK_MOTION_NOTIFY || else if (event_type == GDK_MOTION_NOTIFY ||
event_type == GDK_TOUCH_UPDATE || event_type == GDK_TOUCH_UPDATE ||
(event_type == GDK_TOUCHPAD_SWIPE && phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE) || (EVENT_IS_TOUCHPAD_GESTURE (event) &&
(event_type == GDK_TOUCHPAD_PINCH && phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE)) phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE &&
gdk_touchpad_event_get_n_fingers (event) == priv->n_points))
{ {
if (event_type == GDK_MOTION_NOTIFY) if (event_type == GDK_MOTION_NOTIFY)
{ {
@ -713,9 +714,9 @@ gtk_gesture_handle_event (GtkEventController *controller,
if (!priv->touchpad) if (!priv->touchpad)
_gtk_gesture_cancel_sequence (gesture, sequence); _gtk_gesture_cancel_sequence (gesture, sequence);
} }
else if ((event_type == GDK_TOUCHPAD_SWIPE && phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL) || else if (EVENT_IS_TOUCHPAD_GESTURE (event) &&
(event_type == GDK_TOUCHPAD_PINCH && phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL) || phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL &&
(event_type == GDK_TOUCHPAD_HOLD && phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL)) gdk_touchpad_event_get_n_fingers (event) == priv->n_points)
{ {
if (priv->touchpad) if (priv->touchpad)
_gtk_gesture_cancel_sequence (gesture, sequence); _gtk_gesture_cancel_sequence (gesture, sequence);