From 1e2d9f200df518fc73f64d63e5f60df389d85c29 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 17 May 2012 15:31:23 +0000 Subject: [PATCH] Elm glayer: Clean up handling of the taps timeout and rename it. SVN revision: 71212 --- legacy/elementary/src/lib/elm_gesture_layer.c | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c index 68b7758a1d..b9f4f74f36 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.c +++ b/legacy/elementary/src/lib/elm_gesture_layer.c @@ -257,10 +257,12 @@ struct _Widget_Data double rotate_step; Gesture_Info *gesture[ELM_GESTURE_LAST]; - Ecore_Timer *dbl_timeout; /* When this expires, dbl click/taps ABORTed */ Eina_List *pending; /* List of devices need to refeed *UP event */ Eina_List *touched; /* Information of touched devices */ + /* Taps Gestures */ + Ecore_Timer *gest_taps_timeout; /* When this expires, dbl click/taps ABORTed */ + Eina_Bool repeat_events : 1; }; typedef struct _Widget_Data Widget_Data; @@ -622,10 +624,10 @@ _tap_gestures_test_reset(Gesture_Info *gesture) Eina_List *data; Pointer_Event *pe; - if (wd->dbl_timeout) + if (wd->gest_taps_timeout) { - ecore_timer_del(wd->dbl_timeout); - wd->dbl_timeout = NULL; + ecore_timer_del(wd->gest_taps_timeout); + wd->gest_taps_timeout = NULL; } if (!gesture->data) @@ -953,12 +955,6 @@ _event_history_clear(Evas_Object *obj) _n_long_tap_test_reset(wd->gesture[ELM_GESTURE_N_LONG_TAPS]); } - if (wd->dbl_timeout) - { - ecore_timer_del(wd->dbl_timeout); - wd->dbl_timeout = NULL; - } - _tap_gestures_test_reset(wd->gesture[ELM_GESTURE_N_TAPS]); _tap_gestures_test_reset(wd->gesture[ELM_GESTURE_N_DOUBLE_TAPS]); _tap_gestures_test_reset(wd->gesture[ELM_GESTURE_N_TRIPLE_TAPS]); @@ -1251,7 +1247,7 @@ _multi_tap_timeout(void *data) _tap_gesture_finish(wd->gesture[ELM_GESTURE_N_TRIPLE_TAPS]); _clear_if_finished(data); - wd->dbl_timeout = NULL; + wd->gest_taps_timeout = NULL; return ECORE_CALLBACK_CANCEL; } @@ -1330,14 +1326,14 @@ _tap_gesture_test(Widget_Data *wd, Pointer_Event *pe, } pe_list = _record_pointer_event(st, pe_list, pe, wd, event_info, event_type); - if (!wd->dbl_timeout) + if (!wd->gest_taps_timeout) { - wd->dbl_timeout = ecore_timer_add(ELM_GESTURE_TAP_TIMEOUT, + wd->gest_taps_timeout = ecore_timer_add(ELM_GESTURE_TAP_TIMEOUT, _multi_tap_timeout, gesture->obj); } else { - ecore_timer_reset(wd->dbl_timeout); + ecore_timer_reset(wd->gest_taps_timeout); } if ((pe->device == 0) && (eina_list_count(pe_list) == 1))