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

efl/evas - removed duplicated lines and apply clipping only when clip values are available.

This commit is contained in:
ChunEon Park 2013-06-25 21:56:28 +09:00
parent ede5390258
commit 44568ef01d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/evas/canvas/evas_render.c
View File

@ -1335,11 +1335,11 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
{
int x, y, w, h;
if (_evas_render_has_map(eo_obj, obj))
evas_object_clip_recalc(obj);
if (proxy_src_clip)
{
if (_evas_render_has_map(eo_obj, obj))
evas_object_clip_recalc(obj);
x = obj->cur->cache.clip.x + off_x;
y = obj->cur->cache.clip.y + off_y;
w = obj->cur->cache.clip.w;
@ -1356,9 +1356,6 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
}
else
{
if (_evas_render_has_map(eo_obj, obj))
evas_object_clip_recalc(obj);
//FIXME: Consider to clip by the proxy clipper.
if (proxy_render_data->eo_src != eo_obj)
{
@ -1366,6 +1363,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
y = obj->cur->clipper->cur->geometry.y + off_y;
w = obj->cur->clipper->cur->geometry.w;
h = obj->cur->clipper->cur->geometry.h;
e->engine.func->context_clip_set(e->engine.data.output, ctx, x, y, w, h);
}
else
{
@ -1379,10 +1377,9 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
off_y;
w = proxy->cur->clipper->cur->geometry.w;
h = proxy->cur->clipper->cur->geometry.h;
e->engine.func->context_clip_set(e->engine.data.output, ctx, x, y, w, h);
}
}
e->engine.func->context_clip_set(e->engine.data.output,
ctx, x, y, w, h);
}
}
obj->func->render(eo_obj, obj, e->engine.data.output, ctx,