diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 0e006e2c9..4a24ed540 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -81,6 +81,7 @@ _e_zone_cb_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *eve E_Zone *zone = data; if (!ev->timestamp) return; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; edge = _e_zone_detect_edge(zone, obj); if (edge == E_ZONE_EDGE_NONE) return; @@ -93,7 +94,8 @@ _e_zone_cb_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *eve zev->drag = !!evas_pointer_button_down_mask_get(e_comp->evas); ecore_event_add(E_EVENT_ZONE_EDGE_IN, zev, NULL, NULL); - e_bindings_edge_in_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev); + if (e_bindings_edge_in_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev)) + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } static void @@ -105,6 +107,7 @@ _e_zone_cb_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *ev E_Zone *zone = data; if (!ev->timestamp) return; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; edge = _e_zone_detect_edge(zone, obj); if (edge == E_ZONE_EDGE_NONE) return; @@ -117,7 +120,8 @@ _e_zone_cb_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *ev zev->drag = !!evas_pointer_button_down_mask_get(e_comp->evas); ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL); - e_bindings_edge_out_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev); + if (e_bindings_edge_out_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev)) + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } static void @@ -129,6 +133,7 @@ _e_zone_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e E_Zone *zone = data; if (!ev->timestamp) return; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; edge = _e_zone_detect_edge(zone, obj); if (edge == E_ZONE_EDGE_NONE) return; @@ -140,7 +145,8 @@ _e_zone_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e zev->button = ev->button; zev->modifiers = e_bindings_evas_modifiers_convert(ev->modifiers); ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL); - e_bindings_edge_down_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev); + if (e_bindings_edge_down_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev)) + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } static void @@ -152,6 +158,7 @@ _e_zone_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *eve E_Zone *zone = data; if (!ev->timestamp) return; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; edge = _e_zone_detect_edge(zone, obj); if (edge == E_ZONE_EDGE_NONE) return; @@ -163,7 +170,8 @@ _e_zone_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *eve zev->button = ev->button; zev->modifiers = e_bindings_evas_modifiers_convert(ev->modifiers); ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL); - e_bindings_edge_up_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev); + if (e_bindings_edge_up_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev)) + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } static void @@ -174,6 +182,7 @@ _e_zone_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e E_Zone_Edge edge; E_Zone *zone = data; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; edge = _e_zone_detect_edge(zone, obj); if (edge == E_ZONE_EDGE_NONE) return; @@ -1478,10 +1487,11 @@ _e_zone_cb_bg_mouse_down(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { - E_Zone *zone; + E_Zone *zone = data; + Evas_Event_Mouse_Down *ev = event_info; - zone = data; if (e_comp_util_mouse_grabbed()) return; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (!zone->cur_mouse_action) { @@ -1505,9 +1515,10 @@ _e_zone_cb_bg_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { - E_Zone *zone; + E_Zone *zone = data; + Evas_Event_Mouse_Up *ev = event_info; - zone = data; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (zone->cur_mouse_action) { E_Binding_Event_Mouse_Button event;