forked from enlightenment/enlightenment
further improve keyboard handling while gadget editor is active
This commit is contained in:
parent
92a0cb11d6
commit
2d80ef091e
|
@ -2572,11 +2572,14 @@ _gadget_desklock_clear(void)
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_gadget_desklock_key_handler(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Key *ev)
|
_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 (eina_streq(ev->key, "Escape"))
|
||||||
{
|
{
|
||||||
if (pointer_site)
|
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
|
else
|
||||||
_gadget_desklock_del();
|
_gadget_desklock_del();
|
||||||
}
|
}
|
||||||
|
@ -2651,11 +2654,14 @@ e_gadget_site_desklock_edit(void)
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_gadget_desktop_key_handler(void *data, int t EINA_UNUSED, Ecore_Event_Key *ev)
|
_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 (eina_streq(ev->key, "Escape"))
|
||||||
{
|
{
|
||||||
if (pointer_site)
|
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
|
else
|
||||||
_edit_end();
|
_edit_end();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue