enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

further improve keyboard handling while gadget editor is active

This commit is contained in:
Mike Blumenkrantz 2017-08-11 18:48:53 -04:00
parent 92a0cb11d6
commit 2d80ef091e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/e_gadget.c
View File

@ -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();
}