summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-11-02 10:20:04 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-18 11:36:58 -0500
commitef2112c7dbdb9a3b9a7b8c5531c024333d6fbe90 (patch)
tree5fdd4bc34453a7665d4e68b6c973361e2aef6f87
parent6ec652a4ffcf7571abb233bcd6b03454f7e458a1 (diff)
feed mouse-up when dropping a gadget site before enabling events on the site
prevents unintentional activation of gadget actions during moves
-rw-r--r--src/bin/e_gadget.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 7bbe5ede3..4f0c378ec 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -1824,6 +1824,7 @@ _editor_pointer_button(Gadget_Item *active, int t EINA_UNUSED, Ecore_Event_Mouse
1824 evas_object_geometry_get(active->site, &x, &y, &w, &h); 1824 evas_object_geometry_get(active->site, &x, &y, &w, &h);
1825 if ((ev->buttons == 1) && E_INSIDE(ev->x, ev->y, x, y, w, h)) 1825 if ((ev->buttons == 1) && E_INSIDE(ev->x, ev->y, x, y, w, h))
1826 evas_object_smart_callback_call(active->site, "gadget_site_dropped", pointer_site); 1826 evas_object_smart_callback_call(active->site, "gadget_site_dropped", pointer_site);
1827 e_comp_canvas_feed_mouse_up(0);
1827 evas_object_pass_events_set(active->site, 0); 1828 evas_object_pass_events_set(active->site, 0);
1828 elm_object_disabled_set(active->editor, 1); 1829 elm_object_disabled_set(active->editor, 1);
1829 e_comp_object_util_del_list_remove(active->editor, pointer_site); 1830 e_comp_object_util_del_list_remove(active->editor, pointer_site);
@@ -1851,6 +1852,7 @@ _editor_pointer_button(Gadget_Item *active, int t EINA_UNUSED, Ecore_Event_Mouse
1851 } 1852 }
1852 zgs = evas_object_data_get(pointer_site, "__e_gadget_site"); 1853 zgs = evas_object_data_get(pointer_site, "__e_gadget_site");
1853 zgc = eina_list_data_get(zgs->gadgets); 1854 zgc = eina_list_data_get(zgs->gadgets);
1855 e_comp_canvas_feed_mouse_up(0);
1854 evas_object_pass_events_set(zgc->orig->site->layout, 0); 1856 evas_object_pass_events_set(zgc->orig->site->layout, 0);
1855 if (zzgs) 1857 if (zzgs)
1856 { 1858 {