From c39bf3cc4e2c0c3e00b5309a9965ab067fe97cfb Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 27 Oct 2005 04:36:58 +0000
Subject: [PATCH] no that made it worse.. evas renders everything. fix. must
 find it.

SVN revision: 18006
---
 legacy/evas/src/lib/canvas/evas_render.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index ac861d407e..e8be31d254 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -68,17 +68,15 @@ evas_obscured_clear(Evas *e)
 static void
 _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Evas_List **active_objects, Evas_List **restack_objects, int restack)
 {
+   int is_active;
+   
 /* if (obj->cur.cache.clip.dirty) */
    evas_object_clip_recalc(obj);
    /* build active object list */
-   if (evas_object_is_active(obj))
+   is_active = evas_object_is_active(obj);
+   if (is_active)
      *active_objects = evas_list_append(*active_objects, obj);
-   if (restack)
-     {
-	obj->restack = 1;
-	obj->changed = 1;
-     }
-   if (obj->changed)
+   if ((obj->changed) || (restack))
      {
 	if (obj->smart.smart)
 	  {
@@ -92,13 +90,14 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Evas_List **active
 		  obj2 = (Evas_Object *)l;
 		  _evas_render_phase1_object_process(e, obj2, 
 						     active_objects,
-						     restack_objects, obj->restack);
+						     restack_objects,
+						     obj->restack | restack);
 	       }
 	  }
 	else
 	  {
-	     if ((obj->restack) && (!obj->clip.clipees) &&
-		 evas_object_is_active(obj))
+	     if ((is_active) && (obj->restack | restack) &&
+		 (!obj->clip.clipees))
 	       *restack_objects = evas_list_append(*restack_objects, obj);
 	     else
 	       obj->func->render_pre(obj);
@@ -135,8 +134,8 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Evas_List **active
 							    obj->cur.cache.clip.h);
 	       }
 	  }
-	obj->restack = 0;
      }
+   obj->restack = 0;
 }
 
 static void