summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/elm_entry.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 5e6d9cf31..8c4239669 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -379,7 +379,7 @@ _long_press(void *data)
379 { 379 {
380 wd->api->obj_longpress(data); 380 wd->api->obj_longpress(data);
381 } 381 }
382 else 382 else if (wd->context_menu)
383 { 383 {
384 if (wd->hoversel) evas_object_del(wd->hoversel); 384 if (wd->hoversel) evas_object_del(wd->hoversel);
385 else elm_widget_scroll_freeze_push(data); 385 else elm_widget_scroll_freeze_push(data);
@@ -419,10 +419,10 @@ _long_press(void *data)
419 evas_object_show(wd->hoversel); 419 evas_object_show(wd->hoversel);
420 elm_hoversel_hover_begin(wd->hoversel); 420 elm_hoversel_hover_begin(wd->hoversel);
421 } 421 }
422 edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0);
423 edje_object_part_text_select_abort(wd->ent, "elm.text");
422 } 424 }
423 wd->longpress_timer = NULL; 425 wd->longpress_timer = NULL;
424 edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0);
425 edje_object_part_text_select_abort(wd->ent, "elm.text");
426 evas_object_smart_callback_call(data, "longpressed", NULL); 426 evas_object_smart_callback_call(data, "longpressed", NULL);
427 return 0; 427 return 0;
428} 428}
@@ -1479,17 +1479,6 @@ elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled)
1479 if (!wd) return; 1479 if (!wd) return;
1480 if (wd->context_menu == !disabled) return; 1480 if (wd->context_menu == !disabled) return;
1481 wd->context_menu = !disabled; 1481 wd->context_menu = !disabled;
1482
1483 if (wd->context_menu)
1484 {
1485 evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj);
1486 evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj);
1487 }
1488 else
1489 {
1490 evas_object_event_callback_del_full(wd->ent, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj);
1491 evas_object_event_callback_del_full(wd->ent, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj);
1492 }
1493} 1482}
1494 1483
1495EAPI Eina_Bool 1484EAPI Eina_Bool