From 6fcab85ab0d398505555eb4fbb60f089994e199f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sun, 17 Feb 2013 14:36:00 +0000 Subject: [PATCH] forwardport previous entry commit for blocking blank hoversels SVN revision: 84023 --- legacy/elementary/ChangeLog | 1 + legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elm_entry.c | 10 +++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 8ca8a3359b..d66d33cfe5 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1041,3 +1041,4 @@ 2013-02-17 Mike Blumenkrantz * ignore tab key widget focus change if control/alt is pressed + * prevent blank entry hoversels diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 2bf80b9c87..981ca7a9a2 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -153,6 +153,7 @@ Fixes: * Fix time string display to handle hours right * Fix elm_config to properly check file type. * ignore tab key widget focus change if control/alt is pressed + * prevent blank entry hoversels Removals: diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index b97e2f0b25..bb13850f3b 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -1227,7 +1227,15 @@ _menu_call(Evas_Object *obj) else if (sd->context_menu) { const char *context_menu_orientation; + Eina_Bool ownersel; + ownersel = elm_selection_selection_has_owner(obj); + if (!sd->items) + { + /* prevent stupid blank hoversel */ + if (sd->have_selection && sd->password) return; + if (sd->sel_mode || (_elm_config->desktop_entry && ((!sd->editable) || (!ownersel)))) return; + } if (sd->hoversel) evas_object_del(sd->hoversel); else elm_widget_scroll_freeze_push(obj); @@ -1275,7 +1283,7 @@ _menu_call(Evas_Object *obj) (sd->hoversel, E_("Select"), NULL, ELM_ICON_NONE, _hover_selected_cb, obj); } - if (elm_selection_selection_has_owner(obj)) + if (ownersel) { if (sd->editable) elm_hoversel_item_add