[PATCH libinput] touchpad: only trigger immediate pinch detection for three fingers

[Hans de Goede]

Hi,

On 26-02-16 01:49, Peter Hutterer wrote:
> 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 <peter.hutterer at who-t.net>

Looks good to me:

Reviewed-by: Hans de Goede <hdegoede at redhat.com>

Regards,

Hans



> ---
>   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 dc8d606..3c8f5a7 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;
>