summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorAharon Hillel <a.hillel@partner.samsung.com>2011-10-25 09:51:34 +0000
committerTom Hacohen <tom@stosb.com>2011-10-25 09:51:34 +0000
commit28053ef4554f571a9d6b73c273925a24a2f07aad (patch)
tree36f9ff4ba1a5f1f1fec186318ef0d64837d403bc /legacy
parent6d4a642ccf199ca9bbbc4379b17d539523a29e49 (diff)
Elm glayer: Added momentum to continues-gestures.
Womentum is now aborted and resarted as the number of fingers changes. Signed-off-by: Aharon Hillel <a.hillel@partner.samsung.com> SVN revision: 64380
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/lib/elm_gesture_layer.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c
index bff601b320..b45b0c90b7 100644
--- a/legacy/elementary/src/lib/elm_gesture_layer.c
+++ b/legacy/elementary/src/lib/elm_gesture_layer.c
@@ -3011,8 +3011,18 @@ void continues_gestures_restart(void *data, Eina_Bool states_reset)
3011 3011
3012 /* Run through events to restart gestures */ 3012 /* Run through events to restart gestures */
3013 Gesture_Info *g; 3013 Gesture_Info *g;
3014 Eina_Bool n_lines, n_flicks, zoom, rotate; 3014 Eina_Bool n_momentum, n_lines, n_flicks, zoom, rotate;
3015 /* We turn-on flag for finished, aborted, not-started gestures */ 3015 /* We turn-on flag for finished, aborted, not-started gestures */
3016 g = wd->gesture[ELM_GESTURE_MOMENTUM];
3017 n_momentum = (g) ? ((states_reset) | ((g->state != ELM_GESTURE_STATE_START)
3018 && (g->state != ELM_GESTURE_STATE_MOVE))) : EINA_FALSE;
3019 if (n_momentum)
3020 {
3021 _momentum_test_reset(wd->gesture[ELM_GESTURE_MOMENTUM]);
3022 _set_state(g, ELM_GESTURE_STATE_UNDEFINED, NULL, EINA_FALSE);
3023 SET_TEST_BIT(g);
3024 }
3025
3016 g = wd->gesture[ELM_GESTURE_N_LINES]; 3026 g = wd->gesture[ELM_GESTURE_N_LINES];
3017 n_lines = (g) ? ((states_reset) | ((g->state != ELM_GESTURE_STATE_START) 3027 n_lines = (g) ? ((states_reset) | ((g->state != ELM_GESTURE_STATE_START)
3018 && (g->state != ELM_GESTURE_STATE_MOVE))) : EINA_FALSE; 3028 && (g->state != ELM_GESTURE_STATE_MOVE))) : EINA_FALSE;