summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@bitmath.org>2010-08-05 14:12:33 +0200
committerHenrik Rydberg <rydberg@euromail.se>2010-08-05 22:48:38 +0200
commitd5f810a0d3e0013a76136750eaff825ceec099a2 (patch)
tree79a0e866c3be5c6662df28434b8c01459790ab0a /src
parentd8e8d112aa907f8021ae99e6d7cd7856f1d90b70 (diff)
tapping: Cancel multi-finger taps when moving
Cancel multi-finger taps when multi move is active, to avoid accidental tapping during quick gestures. Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
Diffstat (limited to 'src')
-rw-r--r--src/gestures-tapping.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gestures-tapping.c b/src/gestures-tapping.c
index 763bc43..cc0e685 100644
--- a/src/gestures-tapping.c
+++ b/src/gestures-tapping.c
@@ -77,6 +77,8 @@ int gru_tapping(struct grail *ge,
77 if (state->status == TAP_END && 77 if (state->status == TAP_END &&
78 move->time - state->start < TAP_MIN_GAP_MS) 78 move->time - state->start < TAP_MIN_GAP_MS)
79 state->status = TAP_CANCEL; 79 state->status = TAP_CANCEL;
80 if (move->x.active || move->y.active)
81 state->status = TAP_CANCEL;
80 if (state->status == TAP_CANCEL) { 82 if (state->status == TAP_CANCEL) {
81 if (state->active) { 83 if (state->active) {
82 gin_gid_discard(ge, state->gid); 84 gin_gid_discard(ge, state->gid);