enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

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.
This commit is contained in:
Cedric BAIL 2014-08-21 16:10:54 +02:00
parent 0e4b847deb
commit 41fab84f83
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/edje/edje_calc.c
View File

@ -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)
{