summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2014-04-01 14:08:14 +0900
committerChunEon Park <hermet@hermet.pe.kr>2014-04-01 14:12:02 +0900
commit19180386405876c2d4853a38ce37479db412a275 (patch)
tree5e5467ae4665206155424a3292d74f610c2eeff1
parentc2088d83260ccd6b24001aa34aa233f46c621f30 (diff)
evas - fix incorrect object reset.
If the children are rendered in the proxy render time, they should not be reset the changes always since we don't sure they will be rendered in normal rendering after. In this case, we leave them as they are. But maybe they can be optimized by comments says. @fix
-rw-r--r--src/lib/evas/canvas/evas_render.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 6951d1d9a5..10d4aac6d0 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1334,7 +1334,13 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1334 , level + 1 1334 , level + 1
1335#endif 1335#endif
1336 , do_async); 1336 , do_async);
1337 evas_object_change_reset(obj2->object); 1337 /* We aren't sure this object will be rendered by
1338 normal(not proxy) drawing after, we reset this
1339 only in case of normal drawing. For optmizing,
1340 push this object in an array then reset them
1341 in the end of the rendering.*/
1342 if (!proxy_render_data)
1343 evas_object_change_reset(obj2->object);
1338 } 1344 }
1339 } 1345 }
1340 else 1346 else
@@ -1458,7 +1464,13 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1458 , level + 1 1464 , level + 1
1459#endif 1465#endif
1460 , do_async); 1466 , do_async);
1461 evas_object_change_reset(obj2->object); 1467 /* We aren't sure this object will be rendered by
1468 normal(not proxy) drawing after, we reset this
1469 only in case of normal drawing. For optmizing,
1470 push this object in an array then reset them
1471 in the end of the rendering.*/
1472 if (!proxy_render_data)
1473 evas_object_change_reset(obj2->object);
1462 } 1474 }
1463 } 1475 }
1464 else 1476 else