summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-08-17 06:16:04 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-08-17 06:16:04 +0000
commit14d7f1cce708ebdc7707f42a5f99744cff0df2b8 (patch)
tree5b018f9c156cdab8c78ecaebaf5d9d9e0c4378de /legacy
parent225630552ec62a23db1f3f9b244fe2963addf18f (diff)
evas/render - code refactoring.
removed duplicated SVN revision: 75351
Diffstat (limited to 'legacy')
-rw-r--r--legacy/evas/src/lib/canvas/evas_render.c55
1 files changed, 19 insertions, 36 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index db934b0a1e..7c4c4c736a 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -993,52 +993,35 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
993 context); 993 context);
994 if (obj->cur.map->surface) 994 if (obj->cur.map->surface)
995 { 995 {
996 if (obj->smart.smart) 996 if (obj->cur.clipper)
997 { 997 {
998 if (obj->cur.clipper) 998 int x, y, w, h;
999 evas_object_clip_recalc(obj);
1000 x = obj->cur.cache.clip.x;
1001 y = obj->cur.cache.clip.y;
1002 w = obj->cur.cache.clip.w;
1003 h = obj->cur.cache.clip.h;
1004
1005 if (obj->smart.smart)
999 { 1006 {
1000 int x, y, w, h;
1001 Evas_Object *tobj; 1007 Evas_Object *tobj;
1002 1008
1003 obj->cur.cache.clip.dirty = EINA_TRUE; 1009 obj->cur.cache.clip.dirty = EINA_TRUE;
1004 tobj = obj->cur.map_parent; 1010 tobj = obj->cur.map_parent;
1005 obj->cur.map_parent = obj->cur.clipper->cur.map_parent; 1011 obj->cur.map_parent = obj->cur.clipper->cur.map_parent;
1006 evas_object_clip_recalc(obj);
1007 obj->cur.map_parent = tobj; 1012 obj->cur.map_parent = tobj;
1008 x = obj->cur.cache.clip.x;
1009 y = obj->cur.cache.clip.y;
1010 w = obj->cur.cache.clip.w;
1011 h = obj->cur.cache.clip.h;
1012 RECTS_CLIP_TO_RECT(x, y, w, h,
1013 obj->cur.clipper->cur.cache.clip.x,
1014 obj->cur.clipper->cur.cache.clip.y,
1015 obj->cur.clipper->cur.cache.clip.w,
1016 obj->cur.clipper->cur.cache.clip.h);
1017 e->engine.func->context_clip_set(e->engine.data.output,
1018 context,
1019 x + off_x, y + off_y, w, h);
1020 } 1013 }
1021 }
1022 else
1023 {
1024 if (obj->cur.clipper)
1025 {
1026 int x, y, w, h;
1027 1014
1028 evas_object_clip_recalc(obj); 1015 RECTS_CLIP_TO_RECT(x, y, w, h,
1029 x = obj->cur.cache.clip.x; 1016 obj->cur.clipper->cur.cache.clip.x,
1030 y = obj->cur.cache.clip.y; 1017 obj->cur.clipper->cur.cache.clip.y,
1031 w = obj->cur.cache.clip.w; 1018 obj->cur.clipper->cur.cache.clip.w,
1032 h = obj->cur.cache.clip.h; 1019 obj->cur.clipper->cur.cache.clip.h);
1033 RECTS_CLIP_TO_RECT(x, y, w, h, 1020
1034 obj->cur.clipper->cur.cache.clip.x, 1021 e->engine.func->context_clip_set(e->engine.data.output,
1035 obj->cur.clipper->cur.cache.clip.y, 1022 context,
1036 obj->cur.clipper->cur.cache.clip.w, 1023 x + off_x, y + off_y, w, h);
1037 obj->cur.clipper->cur.cache.clip.h); 1024
1038 e->engine.func->context_clip_set(e->engine.data.output,
1039 context,
1040 x + off_x, y + off_y, w, h);
1041 }
1042 } 1025 }
1043 } 1026 }
1044// if (surface == e->engine.data.output) 1027// if (surface == e->engine.data.output)