From 98854667875ef83fc18a393a5d26b30603984b97 Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Fri, 15 Feb 2013 06:48:07 +0000 Subject: [PATCH] Add missed code. This is related to r83501. SVN revision: 83938 --- src/lib/evas/canvas/evas_events.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index a30ebc8140..3b6c0b681f 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -1598,7 +1598,8 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list) obj->mouse_grabbed) && (!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && - (!evas_object_is_source_invisible(eo_obj, obj) || obj->mouse_grabbed) && + (!evas_object_is_source_invisible(eo_obj, obj) || + obj->mouse_grabbed) && (!obj->clip.clipees)) { ev.cur.canvas.x = e->pointer.x; @@ -1759,7 +1760,8 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list) eina_list_data_find(ins, eo_obj) && (!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && - (!evas_object_is_source_invisible(eo_obj, obj) || obj->mouse_grabbed) && + (!evas_object_is_source_invisible(eo_obj, obj) || + obj->mouse_grabbed) && (!obj->clip.clipees) && ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y)) ) @@ -1953,7 +1955,8 @@ nogrep: eina_list_data_find(newin, eo_obj) && (!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && - (!evas_object_is_source_invisible(eo_obj, obj)) && + (!evas_object_is_source_invisible(eo_obj, obj) || + obj->mouse_grabbed) && (!obj->clip.clipees) && ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y)) ) @@ -2492,7 +2495,8 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list) obj->mouse_grabbed) && (!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && - (!evas_object_is_source_invisible(eo_obj, obj)) && + (!evas_object_is_source_invisible(eo_obj, obj) || + obj->mouse_grabbed) && (!obj->clip.clipees)) { ev.cur.canvas.x = x; @@ -2565,7 +2569,8 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list) eina_list_data_find(ins, eo_obj) && (!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && - (!evas_object_is_source_invisible(eo_obj, obj)) && + (!evas_object_is_source_invisible(eo_obj, obj) || + obj->mouse_grabbed) && (!obj->clip.clipees) && ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y)) )