summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-14 14:46:07 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2012-03-14 08:47:05 +1000
commita6361e2d2c093c4170bab63307526702fe9903ad (patch)
tree62efa85f51483387a62837d2f170d5192d7fe1fa
parentde75ad6b073c1a36d5a60190de5ffe6611520637 (diff)
Disable scrolling when beginning a clickpad press
There really isn't a point to scrolling while a clickpad is pressed. In particular, the clickpad button areas and the horizontal edge scrolling areas overlap, so horizontal edge scrolling must be disabled. Also, performing two finger scrolling while a third finger presses the button would require us to inhibit touch events until four touches are present. That is enough reason to disable two finger scrolling as well. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/synaptics.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index 7a6d55f..d422f0f 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1877,6 +1877,12 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
}
break;
case TS_CLICKPAD_MOVE:
+ /* Disable scrolling once a button is pressed on a clickpad */
+ priv->vert_scroll_edge_on = FALSE;
+ priv->horiz_scroll_edge_on = FALSE;
+ priv->vert_scroll_twofinger_on = FALSE;
+ priv->horiz_scroll_twofinger_on = FALSE;
+
/* Assume one touch is only for holding the clickpad button down */
if (hw->numFingers > 1)
hw->numFingers--;