[EGIT] [tools/eflete] eflete-1.18 29/31: manangers: hide menu by Esc

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch eflete-1.18.

http://git.enlightenment.org/tools/eflete.git/commit/?id=29ef58481aa75924a03e6af442d356bfe22595da

commit 29ef58481aa75924a03e6af442d356bfe22595da
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Mon Feb 20 18:40:00 2017 +0200

    manangers: hide menu by Esc
    
    @fix
    
    Change-Id: Id5b87080b1ef63285f45bc79b66a50f783476def
    
     Conflicts:
            src/bin/ui/image_manager.c
---
 src/bin/ui/sound_manager.c | 7 ++++++-
 src/bin/ui/style_manager.c | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index 4232759..187ce87 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -319,9 +319,11 @@ _tone_add(void)
 
 static void
 _sample_add_cb(void *data,
-               Evas_Object *obj __UNUSED__,
+               Evas_Object *obj,
                void *event_info __UNUSED__)
 {
+   shortcuts_object_check_pop(obj);
+
    popup_fileselector_sound_helper(_("Choose a sound"), NULL, NULL, 
_add_sample_done, data, false, false);
 }
 
@@ -437,6 +439,9 @@ _tone_add_cb(void *data __UNUSED__,
              void *event_info __UNUSED__)
 {
    Evas_Object *popup;
+
+   shortcuts_object_check_pop(obj);
+
    mng.tone_validator = resource_name_validator_new(NAME_REGEX, NULL);
    resource_name_validator_list_set(mng.tone_validator, &ap.project->tones, 
true);
    mng.frq_validator = elm_validator_regexp_new(FREQUENCY_REGEX, NULL);
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index dab8058..161b897 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -223,10 +223,13 @@ close:
 
 static void
 _style_add_cb(void *data __UNUSED__,
-              Evas_Object *obj __UNUSED__,
+              Evas_Object *obj,
               void *event_info __UNUSED__)
 {
    Evas_Object *popup;
+
+   shortcuts_object_check_pop(obj);
+
    mng.popup.validator = resource_name_validator_new(NAME_REGEX, NULL);
    resource_name_validator_list_set(mng.popup.validator, &ap.project->styles, 
true);
 
@@ -315,7 +318,7 @@ close:
 }
 static void
 _tag_add_cb(void *data __UNUSED__,
-            Evas_Object *obj __UNUSED__,
+            Evas_Object *obj,
             void *event_info __UNUSED__)
 {
    Resource *res;
@@ -324,6 +327,8 @@ _tag_add_cb(void *data __UNUSED__,
    Evas_Object *popup;
    Tag_Popup_Data * tpd = mem_calloc(1, sizeof(Tag_Popup_Data));
 
+   shortcuts_object_check_pop(obj);
+
    tpd->glit = elm_genlist_selected_item_get(mng.genlist);
    tpd->glit_parent = elm_genlist_item_parent_get(tpd->glit);
 

--