summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2015-06-22 11:59:21 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-22 12:36:57 +0200
commit6a4d59fed00955a7037dfe7d0f19ee3767e9017b (patch)
treef240c0dafa14357424aef0aed97fa15964f171c1
parentf69cb53594f969b2a7d07bfe24f2d8eb43d44faa (diff)
elm_genlist: reset timer to NULL on cancel only.
Summary: @fix Reviewers: raster, seoz, SanghyeonLee Subscribers: sachin.dev, seoz Differential Revision: https://phab.enlightenment.org/D2730 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/elm_genlist.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 17bebca2f..225d0953f 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3859,10 +3859,9 @@ _long_press_cb(void *data)
3859 Eina_List *list; 3859 Eina_List *list;
3860 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 3860 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
3861 3861
3862 it->long_timer = NULL;
3863 if (_is_no_select(it) || 3862 if (_is_no_select(it) ||
3864 eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging)) 3863 eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging))
3865 return ECORE_CALLBACK_CANCEL; 3864 goto end;
3866 3865
3867 sd->longpressed = EINA_TRUE; 3866 sd->longpressed = EINA_TRUE;
3868 evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it)); 3867 evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it));
@@ -3897,6 +3896,8 @@ _long_press_cb(void *data)
3897 edje_object_signal_emit(VIEW(it), SIGNAL_REORDER_ENABLED, "elm"); 3896 edje_object_signal_emit(VIEW(it), SIGNAL_REORDER_ENABLED, "elm");
3898 } 3897 }
3899 3898
3899end:
3900 it->long_timer = NULL;
3900 return ECORE_CALLBACK_CANCEL; 3901 return ECORE_CALLBACK_CANCEL;
3901} 3902}
3902 3903