summaryrefslogtreecommitdiff
path: root/src/evdev-mt-touchpad-edge-scroll.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2015-05-25 11:36:34 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2015-05-27 17:38:25 +1000
commit6d0d36fd473ff410f41b61f7145b38c651163c82 (patch)
tree893039268154f87b51a912afb7569f07743468d8 /src/evdev-mt-touchpad-edge-scroll.c
parent17d3cf414a85ed4b1803913c345bfddc138043e9 (diff)
downloadlibinput-6d0d36fd473ff410f41b61f7145b38c651163c82.tar.gz
touchpad: reset the touch state when edge scrolling is stopped
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Diffstat (limited to 'src/evdev-mt-touchpad-edge-scroll.c')
-rw-r--r--src/evdev-mt-touchpad-edge-scroll.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/evdev-mt-touchpad-edge-scroll.c b/src/evdev-mt-touchpad-edge-scroll.c
index 9bf3f0c0..f7eae9e9 100644
--- a/src/evdev-mt-touchpad-edge-scroll.c
+++ b/src/evdev-mt-touchpad-edge-scroll.c
@@ -438,6 +438,10 @@ tp_edge_scroll_stop_events(struct tp_dispatch *tp, uint64_t time)
&zero,
&zero_discrete);
t->scroll.direction = -1;
+ /* reset touch to area state, avoids loading the
+ * state machine with special case handling */
+ t->scroll.edge = EDGE_NONE;
+ t->scroll.edge_state = EDGE_SCROLL_TOUCH_STATE_AREA;
}
}
}