diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2011-04-04 19:15:47 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2011-04-04 19:46:12 +0200 |
| commit | c915b7f620df19a7303051c5dd14a399c9fab5ed (patch) | |
| tree | f304ec158dfda3fd557bee5a620a2edb675c8fea | |
| parent | 75ec0d6e4e74233ba8b381b45a15ac0db82294e2 (diff) | |
Glue touch gestures as well
All motion-activated gestures are held for a short (glue) time
to allow for direct transition to multi-finger gesture types.
The touch gestures were mistakenly implemented without this.
Fixed with this patch. LP: #748282
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| -rw-r--r-- | src/gestures-touch.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gestures-touch.c b/src/gestures-touch.c index b6a2706..3aa607f 100644 --- a/src/gestures-touch.c +++ b/src/gestures-touch.c | |||
| @@ -53,6 +53,8 @@ int gru_touch(struct grail *ge, | |||
| 53 | state->gid = gin_gid_begin(ge, type, -PRIO_GESTURE, frame); | 53 | state->gid = gin_gid_begin(ge, type, -PRIO_GESTURE, frame); |
| 54 | state->active = 1; | 54 | state->active = 1; |
| 55 | } | 55 | } |
| 56 | if (move->time - move->fm[FM_X].original_ms <= move->fm[FM_X].hold_ms) | ||
| 57 | return 0; | ||
| 56 | state->nprop = gin_add_contact_props(ge->gin, state->prop, frame); | 58 | state->nprop = gin_add_contact_props(ge->gin, state->prop, frame); |
| 57 | gru_event(ge, state->gid, move, state->prop, state->nprop); | 59 | gru_event(ge, state->gid, move, state->prop, state->nprop); |
| 58 | return 1; | 60 | return 1; |
| @@ -88,6 +90,8 @@ int gru_wintouch(struct grail *ge, | |||
| 88 | return 0; | 90 | return 0; |
| 89 | } | 91 | } |
| 90 | } | 92 | } |
| 93 | if (move->time - move->fm[FM_X].original_ms <= move->fm[FM_X].hold_ms) | ||
| 94 | return 0; | ||
| 91 | state->nprop = gin_add_contact_props(ge->gin, state->prop, frame); | 95 | state->nprop = gin_add_contact_props(ge->gin, state->prop, frame); |
| 92 | gru_event(ge, state->gid, move, state->prop, state->nprop); | 96 | gru_event(ge, state->gid, move, state->prop, state->nprop); |
| 93 | return 1; | 97 | return 1; |
