summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-Taek Hong <sth253.hong@samsung.com>2015-10-19 11:42:35 -0700
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-12 10:15:03 +0100
commitfe34f79ac8271888f0eaf7d033223bd9e295ff70 (patch)
tree2aeed426eda93ce48f3002166a05b33593bd7568
parent305fa040f192cc5daf7cc27de23e207f1d8317e8 (diff)
elm_map: block longpressed event when scrolled, zoomed, or rotated
Summary: Currently, longpressed event can be called when map is scrolled, zoomed or rotated. This might cause unintentional result, because mouse need to be down at lease once to execute scroll, zoom, or rotate, and longpressed event will start when those events takes long enough time. Reviewers: seoz, Hermet, woohyun, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3195 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/elm_map.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 064652a98..b2092bd59 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1289,6 +1289,7 @@ _scroll_cb(Evas_Object *obj,
1289 else 1289 else
1290 eo_do(sd->obj, eo_event_callback_call 1290 eo_do(sd->obj, eo_event_callback_call
1291 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL)); 1291 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
1292 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
1292 sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj); 1293 sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
1293 eo_do(sd->obj, eo_event_callback_call 1294 eo_do(sd->obj, eo_event_callback_call
1294 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL)); 1295 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
@@ -3295,6 +3296,7 @@ _pinch_zoom_start_cb(void *data,
3295 EINA_SAFETY_ON_NULL_RETURN_VAL(data, EVAS_EVENT_FLAG_NONE); 3296 EINA_SAFETY_ON_NULL_RETURN_VAL(data, EVAS_EVENT_FLAG_NONE);
3296 3297
3297 sd->pinch_zoom = sd->zoom_detail; 3298 sd->pinch_zoom = sd->zoom_detail;
3299 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
3298 3300
3299 return EVAS_EVENT_FLAG_NONE; 3301 return EVAS_EVENT_FLAG_NONE;
3300} 3302}
@@ -3338,6 +3340,7 @@ _pinch_rotate_cb(void *data,
3338 3340
3339 evas_object_smart_changed(sd->pan_obj); 3341 evas_object_smart_changed(sd->pan_obj);
3340 } 3342 }
3343 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
3341 3344
3342 return EVAS_EVENT_FLAG_NONE; 3345 return EVAS_EVENT_FLAG_NONE;
3343} 3346}