summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-10-28 21:57:02 +0100
committerPeter Hutterer <peter.hutterer@redhat.com>2008-11-05 11:01:50 +1030
commit471552a62e0e5ba2a274196aef62d984b83f30e6 (patch)
tree2c5217ac5be67a634da77266c099aefe378c8d5f
parent629e7345dc40c1eb0acf8a69c267711d35d4f3e3 (diff)
Only respect MaxTapMove when appropriate
Only respect MaxTapMove with one or two fingers, and the latter only when two-finger scrolling is enabled. (LP: #270002) Original-Author: William Grant <william.grant@ubuntu.org.au> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
-rw-r--r--src/synaptics.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index c3db2be..df29358 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1247,7 +1247,8 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
touch = finger && !priv->finger_state;
release = !finger && priv->finger_state;
- move = (((abs(hw->x - priv->touch_on.x) >= para->tap_move) ||
+ move = ((priv->tap_max_fingers <= ((priv->horiz_scroll_twofinger_on || priv->vert_scroll_twofinger_on)? 2 : 1)) &&
+ ((abs(hw->x - priv->touch_on.x) >= para->tap_move) ||
(abs(hw->y - priv->touch_on.y) >= para->tap_move)));
if (touch) {