evas/proxy - update rendering when source visibility is switching.

SVN revision: 78249

9 files changed, 12 insertions, 11 deletions

diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index e2f62c3f3a..8d141e9224 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -580,11 +580,10 @@ _image_source_visible_set(Eo *eo_obj, void *_pd, va_list *list)
    if (!o->cur.source) return;
    src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS);
    src_obj->proxy.source_invisible = !visible;
+   src_obj->changed_source_visible = EINA_TRUE;
    evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
                                              EINA_FALSE, EINA_TRUE);
-   src_obj->changed = EINA_TRUE;
    evas_object_change(o->cur.source, src_obj);
-
    //FIXME: Feed mouse events here.
 }
 
@@ -2628,6 +2627,8 @@ _proxy_unset(Evas_Object *proxy)
    if (cur_source->proxy.source_invisible)
      {
         cur_source->proxy.source_invisible = EINA_FALSE;
+        cur_source->changed_source_visible = EINA_TRUE;
+        evas_object_change(o->cur.source, cur_source);
         evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
                                                   EINA_FALSE, EINA_TRUE);
      }
@@ -3652,7 +3653,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
         evas_object_render_pre_visible_change(&e->clip_changes, eo_obj, is_v, was_v);
         if (!o->pixel_updates) goto done;
      }
-   if (obj->changed_map)
+   if (obj->changed_map || obj->changed_source_visible)
      {
         evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
         goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/legacy/evas/src/lib/canvas/evas_object_line.c
index 538488a4a9..1575aed67e 100644
--- a/legacy/evas/src/lib/canvas/evas_object_line.c
+++ b/legacy/evas/src/lib/canvas/evas_object_line.c
@@ -309,7 +309,7 @@ evas_object_line_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
         evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
         goto done;
      }
-   if (obj->changed_map)
+   if (obj->changed_map || obj->changed_source_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj,
                                             obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index 25ce68a3e5..cecc96f794 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -54,6 +54,7 @@ evas_object_change_reset(Evas_Object *eo_obj)
    obj->changed_color = EINA_FALSE;
    obj->changed_map = EINA_FALSE;
    obj->changed_pchange = EINA_FALSE;
+   obj->changed_source_visible = EINA_FALSE;
 }
 
 void
diff --git a/legacy/evas/src/lib/canvas/evas_object_polygon.c b/legacy/evas/src/lib/canvas/evas_object_polygon.c
index 3f94317ed0..4b414818e2 100644
--- a/legacy/evas/src/lib/canvas/evas_object_polygon.c
+++ b/legacy/evas/src/lib/canvas/evas_object_polygon.c
@@ -366,9 +366,7 @@ evas_object_polygon_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *
         evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
         goto done;
      }
-   if (obj->changed_map)
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
+   if (obj->changed_map || obj->changed_source_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj);
         goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_rectangle.c b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
index b04b4fdfd6..854e327538 100644
--- a/legacy/evas/src/lib/canvas/evas_object_rectangle.c
+++ b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
@@ -178,7 +178,7 @@ evas_object_rectangle_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
         evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
         goto done;
      }
-   if (obj->changed_map)
+   if (obj->changed_map || obj->changed_source_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj);
         goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index 66637190f8..d4c9b55319 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -1846,7 +1846,7 @@ evas_object_text_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
                                               eo_obj, is_v, was_v);
         goto done;
      }
-   if (obj->changed_map)
+   if (obj->changed_map || obj->changed_source_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
                                             eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index fd96cd6191..55b29afded 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -10015,7 +10015,7 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
         evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
         goto done;
      }
-   if (obj->changed_map)
+   if (obj->changed_map || obj->changed_source_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
                                             eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_textgrid.c b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
index 40b22a78c7..d6a913864b 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textgrid.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
@@ -722,7 +722,7 @@ evas_object_textgrid_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
         evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
         goto done;
      }
-   if (obj->changed_map)
+   if (obj->changed_map || obj->changed_source_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
                                             eo_obj, obj);
diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h
index 20ac255fb2..7001f7680a 100644
--- a/legacy/evas/src/lib/include/evas_private.h
+++ b/legacy/evas/src/lib/include/evas_private.h
@@ -667,6 +667,7 @@ struct _Evas_Object_Protected_Data
    Eina_Bool                   changed_color : 1;
    Eina_Bool                   changed_map : 1;
    Eina_Bool                   changed_pchange : 1;
+   Eina_Bool                   changed_source_visible : 1;
    Eina_Bool                   del_ref : 1;
 
    Eina_Bool                   is_frame : 1;