From dbb85f67396ce47ca0fb66b610b3818f9a041ca0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 24 Feb 2016 13:46:48 +1000 Subject: [PATCH] touchpad: only trigger immediate pinch detection for three fingers If the fingers are vertically apart by more than 20mm we used to assume a pinch gesture immediately. This is too close together for some users during two-finger scrolling. Since we should always bias towards scrolling, only trigger this detection for three fingers, the rest has to go through the movement detection. The reason for the pinch detection here was to differentiate from 3fg swipe gestures (83f3dbd1), hence we're still in spirit of that patch. https://bugs.freedesktop.org/show_bug.cgi?id=94264 Signed-off-by: Peter Hutterer Tested-by: Jan Alexander Steffens (heftig) Reviewed-by: Hans de Goede --- src/evdev-mt-touchpad-gestures.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c index dc8d6060..3c8f5a7a 100644 --- a/src/evdev-mt-touchpad-gestures.c +++ b/src/evdev-mt-touchpad-gestures.c @@ -339,6 +339,7 @@ tp_gesture_handle_state_unknown(struct tp_dispatch *tp, uint64_t time) /* Else check if one finger is > 20mm below the others */ vert_distance = abs(first->point.y - second->point.y); if (vert_distance > 20 * yres && + tp->gesture.finger_count > 2 && tp->gesture.enabled) { tp_gesture_init_pinch(tp); return GESTURE_STATE_PINCH; -- 2.34.1