[EGIT] [tools/enventor] master 01/01: file_mgr: Fix T1754 (file mgr warning box is not dismissed with esc key)

[Jaehyun Cho]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=c31f0f4f0ba59439b4409d6ee7e78ee407b6ae11

commit c31f0f4f0ba59439b4409d6ee7e78ee407b6ae11
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date:   Sat Nov 1 00:56:56 2014 +0900

    file_mgr: Fix T1754 (file mgr warning box is not dismissed with esc key)
    
    Summary: Fix T1754 (file mgr warning box is not dismissed with esc key)
    
    Reviewers: Hermet
    
    Reviewed By: Hermet
    
    Maniphest Tasks: T1754
    
    Differential Revision: https://phab.enlightenment.org/D1629
---
 src/bin/file_mgr.c     | 16 ++++++++++++++++
 src/bin/main.c         |  6 ++++++
 src/include/file_mgr.h |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c
index 2f2f1d0..3834014 100644
--- a/src/bin/file_mgr.c
+++ b/src/bin/file_mgr.c
@@ -127,6 +127,22 @@ enventor_edc_modified_cb(void *data, Evas_Object *obj 
EINA_UNUSED, void *event)
    fmd->edc_modified = EINA_FALSE;
 }
 
+Eina_Bool
+file_mgr_warning_is_opened(void)
+{
+   file_mgr_data *fmd = g_fmd;
+   return ((fmd && fmd->warning_layout) ? EINA_TRUE : EINA_FALSE);
+}
+
+void
+file_mgr_warning_close(void)
+{
+   file_mgr_data *fmd = g_fmd;
+
+   if (fmd->warning_layout)
+     warning_close(fmd);
+}
+
 void
 file_mgr_init(Evas_Object *enventor)
 {
diff --git a/src/bin/main.c b/src/bin/main.c
index 6ac3999..cd676b1 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -669,6 +669,12 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void 
*ev)
              enventor_object_focus_set(ad->enventor, EINA_TRUE);
              return ECORE_CALLBACK_DONE;
           }
+        if (file_mgr_warning_is_opened())
+          {
+             file_mgr_warning_close();
+             return ECORE_CALLBACK_DONE;
+          }
+
         menu_toggle();
         return ECORE_CALLBACK_DONE;
      }
diff --git a/src/include/file_mgr.h b/src/include/file_mgr.h
index 0e48d1a..c595a9d 100644
--- a/src/include/file_mgr.h
+++ b/src/include/file_mgr.h
@@ -1,2 +1,4 @@
+Eina_Bool file_mgr_warning_is_opened(void);
+void file_mgr_warning_close(void);
 void file_mgr_init(Evas_Object *enventor);
 void file_mgr_term(void);

--