evas/event - my commit caused some problem. revert temporarly.

SVN revision: 78316

2 files changed, 9 insertions, 14 deletions

diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index a41f5e3815..168e8c823e 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -60,7 +60,7 @@ _evas_event_object_list_raw_in_get(Evas *eo_e, Eina_List *in,
              return in;
           }
         if (evas_event_passes_through(eo_obj, obj)) continue;
-        if (evas_object_is_source_invisible(eo_obj, obj)) continue;
+        //if (evas_object_is_source_invisible(eo_obj, obj)) continue;
         if ((obj->cur.visible) && (obj->delete_me == 0) &&
             (!obj->clip.clipees) &&
             (evas_object_clippers_is_visible(eo_obj, obj)))
@@ -828,7 +828,7 @@ _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)) &&
+//                      (!evas_object_is_source_invisible(eo_obj, obj)) &&
                       (!obj->clip.clipees))
                     {
                        if ((px != x) || (py != y))
@@ -970,7 +970,7 @@ _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)) &&
+                 //(!evas_object_is_source_invisible(eo_obj, obj)) &&
                  (!obj->clip.clipees) &&
                  ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
                 )
@@ -1144,7 +1144,7 @@ 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->clip.clipees) &&
                  ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
                 )
@@ -1662,7 +1662,7 @@ _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->clip.clipees))
                {
                   ev.cur.canvas.x = x;
@@ -1731,7 +1731,7 @@ _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->clip.clipees) &&
                  ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
                 )
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index a1600cb271..afcbd3634b 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -1330,8 +1330,6 @@ evas_object_smart_render(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_
 static void
 evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 {
-   Evas_Public_Data *e;
-
    if (obj->pre_render_done) return;
    if (!obj->child_has_map && !obj->cur.cached_surface)
      {
@@ -1405,12 +1403,9 @@ evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
 #endif
      }
 
-   e = obj->layer->evas;
-
-   if (obj->changed_map)
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
-     }
+   if (obj->changed_map || obj->changed_source_visible)
+     evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
+                                         eo_obj, obj);
 
    obj->pre_render_done = EINA_TRUE;
 }