summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-17 14:31:52 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-17 14:31:52 +0000
commit13e0c6a52d1691f18df4862bae2dbdc857e3fc20 (patch)
treed06378e69a855755ff8fba430e43c6f7434a4989
parent0c61f8bd9579e7171e0819e5794289c6eef8b82d (diff)
downloadelementary-13e0c6a52d1691f18df4862bae2dbdc857e3fc20.tar.gz
no longer shall the masses waste away under the continued oppression of blank hoversels when right clicking on an entry anchor! nay! the time has time for us to rise up and crush these vacuous oppressors as they so justly deserve! THIS IS ELEMENTARRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY in branches
SVN revision: 84022
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/lib/elm_entry.c10
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 37a200ea9..ad67de805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -751,3 +751,4 @@
2013-02-17 Mike Blumenkrantz
* ignore tab key widget focus change if control/alt is pressed
+ * prevent blank entry hoversels
diff --git a/NEWS b/NEWS
index f7ffacc0c..9262f6347 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Fixes:
* Fix a elm_transit crash issue when user delete all target objects in the effect end callback.
* elm_entry_single_line_set should not change cnp_mode when PLAINTEXT mode.
* ignore tab key widget focus change if control/alt is pressed
+ * prevent blank entry hoversels
Elementary 1.7.5
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index aa1e7a913..8684a7049 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1375,7 +1375,15 @@ _menu_press(Evas_Object *obj)
else if (wd->context_menu)
{
const char *context_menu_orientation;
+ Eina_Bool ownersel;
+ ownersel = elm_selection_selection_has_owner(obj);
+ if (!wd->items)
+ {
+ /* prevent stupid blank hoversel */
+ if (wd->have_selection && wd->password) return;
+ if (wd->selmode || (_elm_config->desktop_entry && ((!wd->editable) || (!ownersel)))) return;
+ }
if (wd->hoversel) evas_object_del(wd->hoversel);
else elm_widget_scroll_freeze_push(obj);
wd->hoversel = elm_hoversel_add(obj);
@@ -1416,7 +1424,7 @@ _menu_press(Evas_Object *obj)
elm_hoversel_item_add(wd->hoversel, E_("Select"), NULL, ELM_ICON_NONE,
_select, obj);
}
- if (elm_selection_selection_has_owner(obj))
+ if (ownersel)
{
if (wd->editable)
elm_hoversel_item_add(wd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,