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 <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Hans de Goede 2015-02-16 10:24:28 +01:00
parent f7bef28a54
commit 0cd92aeacd

View file

@ -969,9 +969,8 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data)
return; return;
if (!tp->sendevents.trackpoint_active) { if (!tp->sendevents.trackpoint_active) {
evdev_stop_scroll(tp->device, tp_edge_scroll_stop_events(tp, time);
time, tp_twofinger_stop_scroll(tp, time);
LIBINPUT_POINTER_AXIS_SOURCE_FINGER);
tp_tap_suspend(tp, time); tp_tap_suspend(tp, time);
tp->sendevents.trackpoint_active = true; tp->sendevents.trackpoint_active = true;
} }