gastal pushed a commit to branch master.
commit 3afb2e2a22853d349b46ee34b088e1bd7415159c
Author: Jonas Gastal <[email protected]>
Date: Fri Mar 22 12:12:42 2013 -0300
Fix CURRENT for moving objects.
---
src/lib/edje/edje_calc.c | 12 ------------
src/lib/edje/edje_program.c | 14 --------------
2 files changed, 26 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 46fde4c..5f95c17 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3024,18 +3024,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int
flags, Edje_Calc_Params *sta
p1->physics = physics;
#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;
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 2fea05b..6d6606b 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -571,20 +571,6 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool
force, const char *ssig,
}
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
{
--
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
