Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_main.c evas_render.c
Log Message:
fix renders now
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- evas_object_main.c 27 Oct 2005 04:25:30 -0000 1.38
+++ evas_object_main.c 27 Oct 2005 06:40:28 -0000 1.39
@@ -296,13 +296,10 @@
evas_object_is_active(Evas_Object *obj)
{
if (obj->smart.smart) return 0;
- if ((evas_object_is_visible(obj) ||
- evas_object_was_visible(obj)) &&
- (evas_object_is_in_output_rect(obj, 0, 0,
- obj->layer->evas->output.w,
+ if ((evas_object_is_visible(obj) || evas_object_was_visible(obj)) &&
+ (evas_object_is_in_output_rect(obj, 0, 0, obj->layer->evas->output.w,
obj->layer->evas->output.h) ||
- evas_object_was_in_output_rect(obj, 0, 0,
- obj->layer->evas->output.w,
+ evas_object_was_in_output_rect(obj, 0, 0, obj->layer->evas->output.w,
obj->layer->evas->output.h)))
return 1;
return 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_render.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_render.c 27 Oct 2005 04:36:58 -0000 1.12
+++ evas_render.c 27 Oct 2005 06:40:28 -0000 1.13
@@ -74,9 +74,13 @@
evas_object_clip_recalc(obj);
/* build active object list */
is_active = evas_object_is_active(obj);
- if (is_active)
- *active_objects = evas_list_append(*active_objects, obj);
- if ((obj->changed) || (restack))
+ if (is_active) *active_objects = evas_list_append(*active_objects, obj);
+ if (restack)
+ {
+ obj->restack = 1;
+ obj->changed = 1;
+ }
+ if (obj->changed)
{
if (obj->smart.smart)
{
@@ -91,15 +95,14 @@
_evas_render_phase1_object_process(e, obj2,
active_objects,
restack_objects,
- obj->restack | restack);
+ obj->restack);
}
}
else
{
- if ((is_active) && (obj->restack | restack) &&
- (!obj->clip.clipees))
+ if ((is_active) && (obj->restack) && (!obj->clip.clipees))
*restack_objects = evas_list_append(*restack_objects, obj);
- else
+ else if (is_active)
obj->func->render_pre(obj);
}
}
@@ -135,7 +138,7 @@
}
}
}
- obj->restack = 0;
+ if (!is_active) obj->restack = 0;
}
static void
@@ -364,7 +367,6 @@
obj->restack = 0;
obj->changed = 0;
}
- /* if the object is flagged for deletion - note it */
if (obj->delete_me == 2)
{
delete_objects = evas_list_append(delete_objects, obj);
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
