forked from enlightenment/efl
Fix CURRENT for moving objects.
This commit is contained in:
parent
556111af62
commit
3afb2e2a22
|
@ -3024,18 +3024,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
|
||||||
p1->physics = physics;
|
p1->physics = physics;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
p1->x += ed->x;
|
|
||||||
p1->y += ed->y;
|
|
||||||
EINA_COW_CALC_MAP_BEGIN(p1, p1_write) // FIXME: this will force an allocation on p1
|
|
||||||
{
|
|
||||||
p1_write->center.x += ed->x;
|
|
||||||
p1_write->center.y += ed->y;
|
|
||||||
p1_write->light.x += ed->x;
|
|
||||||
p1_write->light.y += ed->y;
|
|
||||||
p1_write->persp.x += ed->x;
|
|
||||||
p1_write->persp.y += ed->y;
|
|
||||||
}
|
|
||||||
EINA_COW_CALC_MAP_END(p1, p1_write);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
p3 = &lp3;
|
p3 = &lp3;
|
||||||
|
|
|
@ -571,20 +571,6 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
|
||||||
}
|
}
|
||||||
rp->current = tmp;
|
rp->current = tmp;
|
||||||
|
|
||||||
rp->current->x -= ed->x;
|
|
||||||
rp->current->y -= ed->y;
|
|
||||||
|
|
||||||
EINA_COW_WRITE_BEGIN(_edje_calc_params_map_cow, rp->current->map, Edje_Calc_Params_Map, rp_write)
|
|
||||||
{
|
|
||||||
rp_write->center.x -= ed->x;
|
|
||||||
rp_write->center.y -= ed->y;
|
|
||||||
rp_write->light.x -= ed->x;
|
|
||||||
rp_write->light.y -= ed->y;
|
|
||||||
rp_write->persp.x -= ed->x;
|
|
||||||
rp_write->persp.y -= ed->y;
|
|
||||||
}
|
|
||||||
EINA_COW_WRITE_END(_edje_calc_params_map_cow, rp->current->map, rp_write);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue