From bdb13fd1d38a3b5f62fbf335464f1d49f31e9879 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 23 May 2014 16:06:25 +0200 Subject: [PATCH] touchpad: Stop scrolling on a button click / tap On a button click / tap the scrolling event handler no longer gets called, ensure that any in progress scrolling is stopped. Signed-off-by: Hans de Goede Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index ed668ee3..f28cd137 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -549,11 +549,15 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time) struct tp_touch *t = tp_current_touch(tp); double dx, dy; - if (tp_post_button_events(tp, time) != 0) + if (tp_post_button_events(tp, time) != 0) { + tp_stop_scroll_events(tp, time); return; + } - if (tp_tap_handle_state(tp, time) != 0) + if (tp_tap_handle_state(tp, time) != 0) { + tp_stop_scroll_events(tp, time); return; + } if (tp_post_scroll_events(tp, time) != 0) return;