From 4f2d186d2af5b82646032f79a752c51319687c71 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 3 Dec 2009 22:26:37 +0000 Subject: [PATCH] oops - fix. longpress cb always shoudl work. just menu go away. SVN revision: 44178 --- src/lib/elm_entry.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 5e6d9cf..8c42396 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -379,7 +379,7 @@ _long_press(void *data) { wd->api->obj_longpress(data); } - else + else if (wd->context_menu) { if (wd->hoversel) evas_object_del(wd->hoversel); else elm_widget_scroll_freeze_push(data); @@ -419,10 +419,10 @@ _long_press(void *data) evas_object_show(wd->hoversel); elm_hoversel_hover_begin(wd->hoversel); } + edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0); + edje_object_part_text_select_abort(wd->ent, "elm.text"); } wd->longpress_timer = NULL; - edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0); - edje_object_part_text_select_abort(wd->ent, "elm.text"); evas_object_smart_callback_call(data, "longpressed", NULL); return 0; } @@ -1479,17 +1479,6 @@ elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled) if (!wd) return; if (wd->context_menu == !disabled) return; wd->context_menu = !disabled; - - if (wd->context_menu) - { - evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj); - evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj); - } - else - { - evas_object_event_callback_del_full(wd->ent, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj); - evas_object_event_callback_del_full(wd->ent, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj); - } } EAPI Eina_Bool -- 2.7.4