[EGIT] [core/enlightenment] master 07/09: further improve keyboard handling while gadget editor is active

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=2d80ef091eb5b30dea2c52bd6cd3df6b46c8589e

commit 2d80ef091eb5b30dea2c52bd6cd3df6b46c8589e
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Aug 11 18:48:53 2017 -0400

    further improve keyboard handling while gadget editor is active
---
 src/bin/e_gadget.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 9f9b1b410..dfe84a46d 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -2572,11 +2572,14 @@ _gadget_desklock_clear(void)
 static Eina_Bool
 _gadget_desklock_key_handler(void *d EINA_UNUSED, int t EINA_UNUSED, 
Ecore_Event_Key *ev)
 {
-   if (!_editor_site_visible()) return ECORE_CALLBACK_RENEW;
+   if ((!_editor_site_visible()) && (!pointer_site)) return 
ECORE_CALLBACK_RENEW;
    if (eina_streq(ev->key, "Escape"))
      {
         if (pointer_site)
-          E_FREE_FUNC(pointer_site, evas_object_del);
+          {
+             E_FREE_FUNC(pointer_site, evas_object_del);
+             if (desktop_editor) evas_object_show(desktop_editor);
+          }
         else
           _gadget_desklock_del();
      }
@@ -2651,11 +2654,14 @@ e_gadget_site_desklock_edit(void)
 static Eina_Bool
 _gadget_desktop_key_handler(void *data, int t EINA_UNUSED, Ecore_Event_Key *ev)
 {
-   if (!_editor_site_visible()) return ECORE_CALLBACK_RENEW;
+   if ((!_editor_site_visible()) && (!pointer_site)) return 
ECORE_CALLBACK_RENEW;
    if (eina_streq(ev->key, "Escape"))
      {
         if (pointer_site)
-          E_FREE_FUNC(pointer_site, evas_object_del);
+          {
+             E_FREE_FUNC(pointer_site, evas_object_del);
+             if (desktop_editor) evas_object_show(desktop_editor);
+          }
         else
           _edit_end();
      }

--