ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a05039577058ad20ca643efdeff62215b4df5ced

commit a05039577058ad20ca643efdeff62215b4df5ced
Author: Andy Williams <a...@andywilliams.me>
Date:   Sat Sep 17 23:58:55 2016 +0100

    elm: Fix edit popup menu order
    
    Cut/Copy/Paste is the standard order most other places.
    @fix
---
 src/lib/elementary/efl_ui_text.c | 18 ++++++++----------
 src/lib/elementary/elm_entry.c   | 18 ++++++++----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 1f2cbbf..18a8de1 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1582,19 +1582,17 @@ _menu_call(Evas_Object *obj)
           {
              if (!sd->password)
                {
+                  if (sd->editable)
+                    elm_hoversel_item_add
+                       (sd->hoversel, E_("Cut"), NULL, ELM_ICON_NONE,
+                        _hoversel_item_cut_cb, obj);
                   elm_hoversel_item_add
                      (sd->hoversel, E_("Copy"), NULL, ELM_ICON_NONE,
                       _hoversel_item_copy_cb, obj);
-                  if (sd->editable)
-                    {
-                       elm_hoversel_item_add
-                          (sd->hoversel, E_("Cut"), NULL, ELM_ICON_NONE,
-                           _hoversel_item_cut_cb, obj);
-                       if (ownersel)
-                         elm_hoversel_item_add
-                            (sd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,
-                             _hoversel_item_paste_cb, obj);
-                    }
+                  if (sd->editable && ownersel)
+                    elm_hoversel_item_add
+                       (sd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,
+                        _hoversel_item_paste_cb, obj);
                   elm_hoversel_item_add
                     (sd->hoversel, E_("Cancel"), NULL, ELM_ICON_NONE,
                     _hover_cancel_cb, obj);
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index d7bbdf4..7bb79c7 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1683,19 +1683,17 @@ _menu_call(Evas_Object *obj)
           {
              if (!sd->password)
                {
+                  if (sd->editable)
+                    elm_hoversel_item_add
+                       (sd->hoversel, E_("Cut"), NULL, ELM_ICON_NONE,
+                        _cut_cb, obj);
                   elm_hoversel_item_add
                      (sd->hoversel, E_("Copy"), NULL, ELM_ICON_NONE,
                       _copy_cb, obj);
-                  if (sd->editable)
-                    {
-                       elm_hoversel_item_add
-                          (sd->hoversel, E_("Cut"), NULL, ELM_ICON_NONE,
-                           _cut_cb, obj);
-                       if (ownersel)
-                         elm_hoversel_item_add
-                            (sd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,
-                             _paste_cb, obj);
-                    }
+                  if (sd->editable && ownersel)
+                    elm_hoversel_item_add
+                       (sd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,
+                        _paste_cb, obj);
                   elm_hoversel_item_add
                     (sd->hoversel, E_("Cancel"), NULL, ELM_ICON_NONE,
                     _hover_cancel_cb, obj);

-- 


Reply via email to