From 4d1c25276bbbc2167784c5b4d8fbf51b4026264c Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Tue, 7 Dec 2010 10:17:57 +0900 Subject: [PATCH] [longpress] _elm_config->longpress_timeout is adapted --- src/lib/elm_colorpicker.c | 4 ++-- src/lib/elm_entry.c | 2 +- src/lib/elm_gengrid.c | 2 +- src/lib/elm_genlist.c | 2 +- src/lib/elm_list.c | 2 +- src/lib/elm_map.c | 2 +- src/lib/elm_photocam.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_colorpicker.c b/src/lib/elm_colorpicker.c index 6fbbbf7..fd1e5b6 100644 --- a/src/lib/elm_colorpicker.c +++ b/src/lib/elm_colorpicker.c @@ -677,7 +677,7 @@ _left_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__ _draw_rects(data, x); evas_object_smart_callback_call(cp->parent, "changed", NULL); cp->button_state = L_BUTTON_PRESSED; - wd->lp_timer = ecore_timer_add(elm_longpress_timeout_get(), _long_press_timer, cp); + wd->lp_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press_timer, cp); } static void @@ -705,7 +705,7 @@ _right_button_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _draw_rects(data, x); evas_object_smart_callback_call(cp->parent, "changed", NULL); cp->button_state = R_BUTTON_PRESSED; - wd->lp_timer = ecore_timer_add(elm_longpress_timeout_get(), _long_press_timer, cp); + wd->lp_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press_timer, cp); } static void diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 6b74f57..589762c 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -818,7 +818,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void if (ev->button != 1) return; // if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer); - wd->longpress_timer = ecore_timer_add(elm_longpress_timeout_get(), _long_press, data); + wd->longpress_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data); wd->downx = ev->canvas.x; wd->downy = ev->canvas.y; } diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 8c65c0b..075bc98 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -350,7 +350,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf evas_object_smart_callback_call(item->wd->self, "clicked", item); if (item->long_timer) ecore_timer_del(item->long_timer); if (item->realized) - item->long_timer = ecore_timer_add(elm_longpress_timeout_get(), _long_press, item); + item->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, item); else item->long_timer = NULL; } diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 493faab..5fe4a27 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -2596,7 +2596,7 @@ elm_genlist_add(Evas_Object *parent) wd->mode = ELM_LIST_SCROLL; wd->max_items_per_block = MAX_ITEMS_PER_BLOCK; wd->max_items_per_block = 32; - wd->longpress_timeout = elm_longpress_timeout_get(); + wd->longpress_timeout = _elm_config->longpress_timeout; wd->max_git_num = 0; evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj); diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 0b3b09d..39af398 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -406,7 +406,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void _item_hilight(it); wd->longpressed = EINA_FALSE; if (it->long_timer) ecore_timer_del(it->long_timer); - it->long_timer = ecore_timer_add(elm_longpress_timeout_get(), _long_press, it); + it->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, it); /* Always call the callbacks last - the user may delete our context! */ if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) evas_object_smart_callback_call(it->obj, "clicked", it); diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 6f6379d..7c177ce 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -1215,7 +1215,7 @@ _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) evas_object_smart_callback_call(data, SIG_PRESS, ev); wd->longpressed = EINA_FALSE; if (wd->long_timer) ecore_timer_del(wd->long_timer); - wd->long_timer = ecore_timer_add(elm_longpress_timeout_get(), _long_press, data); + wd->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data); } static void diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c index 1156f63..bde9b42 100644 --- a/src/lib/elm_photocam.c +++ b/src/lib/elm_photocam.c @@ -655,7 +655,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void evas_object_smart_callback_call(data, "press", NULL); wd->longpressed = EINA_FALSE; if (wd->long_timer) ecore_timer_del(wd->long_timer); - wd->long_timer = ecore_timer_add(elm_longpress_timeout_get(), _long_press, data); + wd->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data); } static void -- 2.7.4