diff options
| author | ChunEon Park <hermet@hermet.pe.kr> | 2013-04-26 14:45:41 +0900 |
|---|---|---|
| committer | ChunEon Park <hermet@hermet.pe.kr> | 2013-04-26 14:45:41 +0900 |
| commit | 39a864d2f7d38bbb140513706820d83f9e206397 (patch) | |
| tree | 2dcc7208116506669643c3325ed14391b8568284 /src/lib/evas/canvas | |
| parent | 6890a0e4520d6d289fcb8a00e89aee435b4ac72c (diff) | |
| download | efl-39a864d2f7d38bbb140513706820d83f9e206397.tar.gz | |
evas - fix the proxy object to not be clipped by source clipper
Diffstat (limited to 'src/lib/evas/canvas')
| -rw-r--r-- | src/lib/evas/canvas/evas_render.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index 80f1a79bd1..97083e4943 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -969,17 +969,28 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj, RD(" { evas_render_mapped(%p, %p, %p, %p, %i, %i, %i, %i)\n", e, obj, context, surface, off_x, off_y, mapped, level); if (mapped) { - if ((!evas_object_is_visible(eo_obj, obj)) || (obj->clip.clipees) || - (obj->cur->have_clipees)) + if (obj->clip.clipees || obj->cur->have_clipees) { - RDI(level); - RD(" }\n"); - return clean_them; + if (!proxy_render) + { + if (!evas_object_is_visible(eo_obj, obj)) + { + RDI(level); + RD(" }\n"); + return clean_them; + } + } + else + { + RDI(level); + RD(" }\n"); + return clean_them; + } } } - else if (!(((evas_object_is_active(eo_obj, obj) && (!obj->clip.clipees) && - (_evas_render_can_render(eo_obj, obj)))) - )) + else if (!(evas_object_is_active(eo_obj, obj) && + (!obj->clip.clipees) && + _evas_render_can_render(eo_obj, obj))) { RDI(level); RD(" }\n"); @@ -1263,7 +1274,8 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj, { RDI(level); - if (obj->cur->clipper) + //FIXME: Consider to clip by the proxy clipper. + if (!proxy_render && obj->cur->clipper) { RD(" clip: %i %i %ix%i [%i %i %ix%i]\n", obj->cur->cache.clip.x + off_x, @@ -1307,7 +1319,8 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj, } else { - if (obj->cur->clipper) + //FIXME: Consider to clip by the proxy clipper. + if (!proxy_render && obj->cur->clipper) { int x, y, w, h; |