forked from enlightenment/efl
Add missed code. This is related to r83501.
SVN revision: 83938
This commit is contained in:
parent
f4da5922d3
commit
9885466787
|
@ -1598,7 +1598,8 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
|
||||||
obj->mouse_grabbed) &&
|
obj->mouse_grabbed) &&
|
||||||
(!evas_event_passes_through(eo_obj, obj)) &&
|
(!evas_event_passes_through(eo_obj, obj)) &&
|
||||||
(!evas_event_freezes_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->clip.clipees))
|
||||||
{
|
{
|
||||||
ev.cur.canvas.x = e->pointer.x;
|
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) &&
|
eina_list_data_find(ins, eo_obj) &&
|
||||||
(!evas_event_passes_through(eo_obj, obj)) &&
|
(!evas_event_passes_through(eo_obj, obj)) &&
|
||||||
(!evas_event_freezes_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->clip.clipees) &&
|
||||||
((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
|
((!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) &&
|
eina_list_data_find(newin, eo_obj) &&
|
||||||
(!evas_event_passes_through(eo_obj, obj)) &&
|
(!evas_event_passes_through(eo_obj, obj)) &&
|
||||||
(!evas_event_freezes_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->clip.clipees) &&
|
||||||
((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
|
((!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) &&
|
obj->mouse_grabbed) &&
|
||||||
(!evas_event_passes_through(eo_obj, obj)) &&
|
(!evas_event_passes_through(eo_obj, obj)) &&
|
||||||
(!evas_event_freezes_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->clip.clipees))
|
||||||
{
|
{
|
||||||
ev.cur.canvas.x = x;
|
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) &&
|
eina_list_data_find(ins, eo_obj) &&
|
||||||
(!evas_event_passes_through(eo_obj, obj)) &&
|
(!evas_event_passes_through(eo_obj, obj)) &&
|
||||||
(!evas_event_freezes_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->clip.clipees) &&
|
||||||
((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
|
((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue