From c1fe4b4c4ed7d84ed902562327444c0be1711e39 Mon Sep 17 00:00:00 2001 From: raster Date: Tue, 10 Nov 2009 09:10:59 +0000 Subject: [PATCH] aaag found the bugger. printf-- git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@43601 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_text.c | 3 --- src/lib/canvas/evas_render.c | 20 ++++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c index bee82ca..9042060 100644 --- a/src/lib/canvas/evas_object_text.c +++ b/src/lib/canvas/evas_object_text.c @@ -1541,9 +1541,6 @@ evas_object_text_render(Evas_Object *obj, void *output, void *context, void *sur } else if (o->cur.style == EVAS_TEXT_STYLE_SOFT_SHADOW) { - printf("text [%p] %3i %3i '%s'\n", obj, - obj->cur.geometry.x, - obj->cur.geometry.y, o->cur.text); for (j = 0; j < 5; j++) { for (i = 0; i < 5; i++) diff --git a/src/lib/canvas/evas_render.c b/src/lib/canvas/evas_render.c index 887ab91..91e92c9 100644 --- a/src/lib/canvas/evas_render.c +++ b/src/lib/canvas/evas_render.c @@ -197,16 +197,12 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, if (obj->delete_me != 0) clean_them = EINA_TRUE; /* build active object list */ + evas_object_clip_recalc(obj); is_active = evas_object_is_active(obj); - obj->is_active = is_active; if ((is_active) || (obj->delete_me != 0)) - { - printf("act1 [%p]\n", obj); - eina_array_push(active_objects, obj); - } - else - printf("nact [%p]\n", obj); + eina_array_push(active_objects, obj); + if (_evas_render_has_map(obj)) map = 1; if ((restack) && (!map)) @@ -247,7 +243,6 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, } else if (_evas_render_had_map(obj)) { - evas_object_clip_recalc(obj); eina_array_push(restack_objects, obj); _evas_render_prev_cur_clip_cache_add(e, obj); } @@ -256,7 +251,6 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, if (obj->changed) { - evas_object_clip_recalc(obj); if (obj->smart.smart) { eina_array_push(render_objects, obj); @@ -316,6 +310,11 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, eina_array_push(render_objects, obj); obj->rect_del = 1; } + else if (evas_object_is_visible(obj)) + { + eina_array_push(render_objects, obj); + obj->render_pre = 1; + } } } } @@ -450,7 +449,6 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface, ((evas_object_is_visible(obj) && (!obj->cur.have_clipees))))) )) return; - printf("rndr [%p]\n", obj); if (_evas_render_has_map(obj)) { @@ -617,7 +615,6 @@ evas_render_updates_internal(Evas *e, if (!e->changed) return NULL; evas_call_smarts_calculate(e); - printf("--- --- --- --- --- --- --- --- --- --- --- --- --- --- ---\n"); /* Check if the modified object mean recalculating every thing */ if (!e->invalidate) @@ -706,7 +703,6 @@ evas_render_updates_internal(Evas *e, { int off_x, off_y; - printf("============ [ %3i %3i | %3ix%3i ]\n", ux, uy, uw, uh); if (make_updates) { Eina_Rectangle *rect; -- 2.7.4