diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2011-02-24 23:44:39 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2011-03-14 12:55:20 +0100 |
| commit | 1985003a9541c20f9a7139bab499d2259e70ed4f (patch) | |
| tree | 2fedcbff98592883316cb2d629cbe714e079db87 /src/gestures-pinch.c | |
| parent | a8e7fd4304f4ad5e23014a04ad95e4b799c58a53 (diff) | |
Make reset logic of pinch and drag same as for drag
There is no direct reason for one-fingered pinch/rotate gestures
to be discarded immediately, so only reset gestures on touch down,
as for drags.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/gestures-pinch.c')
| -rw-r--r-- | src/gestures-pinch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c index e022e8d..18772a0 100644 --- a/src/gestures-pinch.c +++ b/src/gestures-pinch.c | |||
| @@ -54,7 +54,7 @@ int gru_pinch(struct grail *ge, | |||
| 54 | struct combo_model *state = &gru->pinch; | 54 | struct combo_model *state = &gru->pinch; |
| 55 | struct move_model *move = &gru->move; | 55 | struct move_model *move = &gru->move; |
| 56 | int mask = state->active ? (move->active & fm_mask) : fm_mask; | 56 | int mask = state->active ? (move->active & fm_mask) : fm_mask; |
| 57 | if (!move->multi) { | 57 | if (!move->multi && !move->single) { |
| 58 | if (state->active) { | 58 | if (state->active) { |
| 59 | gru_end(ge, state->gid, move, | 59 | gru_end(ge, state->gid, move, |
| 60 | state->prop, state->nprop); | 60 | state->prop, state->nprop); |
