bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some optimizations seem to have screwed up rendering in corner cases. fixed 

by accounting for some of my new additions


SVN revision: 7086
This commit is contained in:
Carsten Haitzler 2003-06-25 07:58:58 +00:00
parent 6d31f5b8b6
commit 87e41116b8
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
legacy/evas/src/lib/canvas/evas_render.c
View File

@ -91,6 +91,7 @@ evas_render_updates(Evas *e)
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (!e->changed) return NULL; if (!e->changed) return NULL;
/* printf("REND\n");*/
/* phase 1. add extra updates for changed objects */ /* phase 1. add extra updates for changed objects */
for (l = (Evas_Object_List *)e->layers; l; l = l->next) for (l = (Evas_Object_List *)e->layers; l; l = l->next)
{ {
@ -110,24 +111,38 @@ evas_render_updates(Evas *e)
/* something changed... maybe... */ /* something changed... maybe... */
if (obj->changed) if (obj->changed)
{ {
/* printf("change...\n");*/
if ((obj->restack) && if ((obj->restack) &&
(!obj->clip.clipees) && (!obj->clip.clipees) &&
evas_object_is_active(obj)) (!obj->smart.smart) &&
evas_object_is_active(obj))
restack_objects = evas_list_append(restack_objects, obj); restack_objects = evas_list_append(restack_objects, obj);
else else
obj->func->render_pre(obj); obj->func->render_pre(obj);
} }
/* nothng changed at all */ /* nothing changed at all */
else else
{ {
if (evas_object_is_opaque(obj) && if (evas_object_is_opaque(obj) &&
evas_object_is_visible(obj) && evas_object_is_visible(obj) &&
(!obj->smart.smart) &&
(!obj->clip.clipees)) (!obj->clip.clipees))
{
/*
printf("NOchange %s %i %i %ix%i\n",
obj->type,
obj->cur.cache.clip.x,
obj->cur.cache.clip.y,
obj->cur.cache.clip.w,
obj->cur.cache.clip.h);
*/
e->engine.func->output_redraws_rect_del(e->engine.data.output, e->engine.func->output_redraws_rect_del(e->engine.data.output,
obj->cur.cache.clip.x, obj->cur.cache.clip.x,
obj->cur.cache.clip.y, obj->cur.cache.clip.y,
obj->cur.cache.clip.w, obj->cur.cache.clip.w,
obj->cur.cache.clip.h); obj->cur.cache.clip.h);
}
} }
} }
} }
@ -191,8 +206,13 @@ evas_render_updates(Evas *e)
Evas_Object *obj; Evas_Object *obj;
obj = (Evas_Object *)(ll->data); obj = (Evas_Object *)(ll->data);
if (evas_object_is_opaque(obj) && evas_object_is_visible(obj) && if (evas_object_is_opaque(obj) &&
(!obj->clip.clipees) && (obj->cur.color.a >= 255)) evas_object_is_visible(obj) &&
(!obj->clip.clipees) &&
(obj->cur.visible) &&
(!obj->delete_me) &&
(obj->cur.cache.clip.visible) &&
(!obj->smart.smart))
obscuring_objects = evas_list_append(obscuring_objects, obj); obscuring_objects = evas_list_append(obscuring_objects, obj);
} }
/* save this list */ /* save this list */
@ -224,18 +244,21 @@ evas_render_updates(Evas *e)
if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh)) if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh))
obscuring_objects = evas_list_append(obscuring_objects, obj); obscuring_objects = evas_list_append(obscuring_objects, obj);
} }
/* printf("Render area...\n");*/
/* render all object that intersect with rect */ /* render all object that intersect with rect */
for (ll = active_objects; ll; ll = ll->next) for (ll = active_objects; ll; ll = ll->next)
{ {
Evas_Object *obj; Evas_Object *obj;
Evas_List *l3; Evas_List *l3;
obj = (Evas_Object *)(ll->data); obj = (Evas_Object *)(ll->data);
/* if its in our outpout rect and it doesnt clip anything */ /* if its in our outpout rect and it doesnt clip anything */
if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh) && if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh) &&
(!obj->clip.clipees) && (!obj->clip.clipees) &&
(obj->cur.visible) && (obj->cur.visible) &&
(!obj->delete_me) && (!obj->delete_me) &&
(obj->cur.cache.clip.visible) && (obj->cur.cache.clip.visible) &&
(!obj->smart.smart) &&
(obj->cur.color.a > 0)) (obj->cur.color.a > 0))
{ {
int x, y, w, h; int x, y, w, h;
@ -259,6 +282,14 @@ evas_render_updates(Evas *e)
Evas_Object *obj2; Evas_Object *obj2;
obj2 = (Evas_Object *)l3->data; obj2 = (Evas_Object *)l3->data;
/*
printf("CUTOUT %p %s, %i %i %ix%i\n",
obj2, obj2->type,
obj2->cur.cache.clip.x,
obj2->cur.cache.clip.y,
obj2->cur.cache.clip.w,
obj2->cur.cache.clip.h);
*/
e->engine.func->context_cutout_add(e->engine.data.output, e->engine.func->context_cutout_add(e->engine.data.output,
e->engine.data.context, e->engine.data.context,
obj2->cur.cache.clip.x + off_x, obj2->cur.cache.clip.x + off_x,