cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=41fab84f83044303af0fb579e6188cfd25ba4461
commit 41fab84f83044303af0fb579e6188cfd25ba4461 Author: Cedric BAIL <[email protected]> Date: Thu Aug 21 16:10:54 2014 +0200 edje: make edje map have the same behavior has visibility. It is in fact more coherent to follow the logic of visibility for map to. So you don't require a specific state to finish your animation before turning map off. --- src/lib/edje/edje_calc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 3923946..851c15e 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -3610,10 +3610,17 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta break; } - p3->mapped = p1->mapped; + /* mapped is a special case like visible */ + if ((p1->mapped) && (!p2->mapped)) + p3->mapped = (pos != FROM_INT(1)); + else if ((!p1->mapped) && (p2->mapped)) + p3->mapped = (pos != ZERO); + else + p3->mapped = p1->mapped; + p3->persp_on = p3->mapped ? p1->persp_on | p2->persp_on : 0; p3->lighted = p3->mapped ? p1->lighted | p2->lighted : 0; - if (p1->mapped) + if (p3->mapped) { EINA_COW_CALC_MAP_BEGIN(p3, p3_write) { --
