timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje: fix invalid calculation to get a circular dependency

This commit is contained in:
Shinwoo Kim 2016-04-14 21:55:14 +09:00
parent a69903e3b2
commit ca225e7bf3
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3660,18 +3660,15 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
{
Edje_Real_Part *rp = NULL;
if (cep && !strcmp(ep->part->name, cep->part->name))
{
return EINA_TRUE;
}
if (cep == ep) return EINA_TRUE;
if (!cep) cep = ep;
if ((ep->calculating & FLAG_X))
if ((cep->calculating & FLAG_X))
{
if (ep->param1.description)
if (cep->param1.description)
{
if (ep->param1.description->rel1.id_x >= 0)
if (cep->param1.description->rel1.id_x >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param1.description->rel1.id_x];
if (_circular_dependency_find(ed, ep, rp, clist))
{
@ -3679,9 +3676,8 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
return EINA_TRUE;
}
}
if (ep->param1.description->rel2.id_x >= 0)
if (cep->param1.description->rel2.id_x >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param1.description->rel2.id_x];
if (_circular_dependency_find(ed, ep, rp, clist))
{
@ -3691,11 +3687,10 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
}
}
if (ep->param2)
if (cep->param2)
{
if (ep->param2->description->rel1.id_x >= 0)
if (cep->param2->description->rel1.id_x >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param2->description->rel1.id_x];
if (_circular_dependency_find(ed, ep, rp, clist))
{
@ -3703,9 +3698,8 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
return EINA_TRUE;
}
}
if (ep->param2->description->rel2.id_x >= 0)
if (cep->param2->description->rel2.id_x >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param2->description->rel2.id_x];
if (_circular_dependency_find(ed, ep, rp, clist))
{
@ -3715,13 +3709,12 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
}
}
}
if ((ep->calculating & FLAG_Y))
if ((cep->calculating & FLAG_Y))
{
if (ep->param1.description)
if (cep->param1.description)
{
if (ep->param1.description->rel1.id_y >= 0)
if (cep->param1.description->rel1.id_y >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param1.description->rel1.id_y];
if (_circular_dependency_find(ed, ep, rp, clist))
{
@ -3729,9 +3722,8 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
return EINA_TRUE;
}
}
if (ep->param1.description->rel2.id_y >= 0)
if (cep->param1.description->rel2.id_y >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param1.description->rel2.id_y];
if (_circular_dependency_find(ed, ep, rp, clist))
{
@ -3740,11 +3732,10 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
}
}
}
if (ep->param2)
if (cep->param2)
{
if (ep->param2->description->rel1.id_y >= 0)
if (cep->param2->description->rel1.id_y >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param2->description->rel1.id_y];
if (_circular_dependency_find(ed, ep, rp, clist))
{
@ -3752,9 +3743,8 @@ _circular_dependency_find(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part *cep, Ein
return EINA_TRUE;
}
}
if (ep->param2->description->rel2.id_y >= 0)
if (cep->param2->description->rel2.id_y >= 0)
{
if (!cep) cep = ep;
rp = ed->table_parts[cep->param2->description->rel2.id_y];
if (_circular_dependency_find(ed, ep, rp, clist))
{