From 0cd92aeacd66693585b7fea0e9007c3b9e59c853 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 16 Feb 2015 10:24:28 +0100 Subject: [PATCH] touchpad: Also stop edge scrolling when the trackpoint becomes active Not only stop 2fg scrolling, but also edge scrolling when the trackpoint becomes active. Signed-off-by: Hans de Goede Reviewed-by: Peter Hutterer --- src/evdev-mt-touchpad.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 779b1661..19383718 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -969,9 +969,8 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) return; if (!tp->sendevents.trackpoint_active) { - evdev_stop_scroll(tp->device, - time, - LIBINPUT_POINTER_AXIS_SOURCE_FINGER); + tp_edge_scroll_stop_events(tp, time); + tp_twofinger_stop_scroll(tp, time); tp_tap_suspend(tp, time); tp->sendevents.trackpoint_active = true; }