summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-07-14 18:44:22 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-07-14 18:40:50 -0400
commit5e7e38d2c4d841e3c3873263897a05a44c65a19d (patch)
tree031f060fec07eaebd56c020834ffdfb3ca4b7309
parent4e8836e5913e62d4dc19a81c162f7038413ecda8 (diff)
downloadenlightenment-5e7e38d2c4d841e3c3873263897a05a44c65a19d.tar.gz
don't close gadget editor if ON_HOLD is set or click is not button 1
-rw-r--r--src/bin/e_gadget.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 5742e59bf1..86355cbd73 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -2463,8 +2463,11 @@ _gadget_desklock_key_handler(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Event
}
static void
-_gadget_desklock_mouse_up_handler()
+_gadget_desklock_mouse_up_handler(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
+ Evas_Event_Mouse_Down *ev = event_info;
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+ if (ev->button != 1) return;
if (!_editor_site_visible()) return;
if (!added)
_gadget_desklock_del();
@@ -2541,8 +2544,11 @@ _gadget_desktop_key_handler(void *data, int t EINA_UNUSED, Ecore_Event_Key *ev)
}
static void
-_gadget_desktop_mouse_up_handler()
+_gadget_desktop_mouse_up_handler(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
+ Evas_Event_Mouse_Down *ev = event_info;
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+ if (ev->button != 1) return;
if (!_editor_site_visible()) return;
if (!added)
_edit_end();