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>

2 files changed, 2 insertions, 2 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,
         struct combo_model *state = &gru->pinch;
         struct move_model *move = &gru->move;
         int mask = state->active ? (move->active & fm_mask) : fm_mask;
-        if (!move->multi) {
+        if (!move->multi && !move->single) {
                 if (state->active) {
                         gru_end(ge, state->gid, move,
                                 state->prop, state->nprop);
diff --git a/src/gestures-rotate.c b/src/gestures-rotate.c
index dd95c32..03e8f3c 100644
--- a/src/gestures-rotate.c
+++ b/src/gestures-rotate.c
@@ -53,7 +53,7 @@ int gru_rotate(struct grail *ge,
         struct combo_model *state = &gru->rotate;
         struct move_model *move = &gru->move;
         int mask = state->active ? (move->active & fm_mask) : fm_mask;
-        if (!move->multi) {
+        if (!move->multi && !move->single) {
                 if (state->active) {
                         gru_end(ge, state->gid, move,
                                 state->prop, state->nprop);