enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

* edje: Fix fixed point use in map. 

Note: ep->description_pos is a FLOAT_T.


SVN revision: 46245
This commit is contained in:
Cedric BAIL 2010-02-17 13:21:50 +00:00
parent 698f67609c
commit 06f7da42f9
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
legacy/edje/src/lib/edje_calc.c
View File

@ -2026,18 +2026,18 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags)
map = evas_map_new(4); map = evas_map_new(4);
evas_map_util_points_populate_from_geometry evas_map_util_points_populate_from_geometry
(map, ed->x + pf->x, ed->y + pf->y, pf->w, pf->h, 0); (map, ed->x + pf->x, ed->y + pf->y, pf->w, pf->h, 0);
cx = ed->x + pf->x + (pf->w / 2); cx = ed->x + pf->x + (pf->w / 2);
cy = ed->y + pf->y + (pf->h / 2); cy = ed->y + pf->y + (pf->h / 2);
if ((chosen_desc->map.rot.id_center >= 0) && if ((chosen_desc->map.rot.id_center >= 0) &&
(chosen_desc->map.rot.id_center != ep->part->id)) (chosen_desc->map.rot.id_center != ep->part->id))
{ {
Edje_Real_Part *ep2 = Edje_Real_Part *ep2 =
ed->table_parts[chosen_desc->map.rot.id_center % ed->table_parts[chosen_desc->map.rot.id_center %
ed->table_parts_size]; ed->table_parts_size];
if (ep2) if (ep2)
{ {
if (!ep2->calculated) if (!ep2->calculated)
_edje_part_recalc(ed, ep2, flags); _edje_part_recalc(ed, ep2, flags);
cx = ed->x + ep2->x + (ep2->w / 2); cx = ed->x + ep2->x + (ep2->w / 2);
cy = ed->y + ep2->y + (ep2->h / 2); cy = ed->y + ep2->y + (ep2->h / 2);
@ -2045,18 +2045,18 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags)
} }
if ((ep->param2) && (ep->description_pos != ZERO)) if ((ep->param2) && (ep->description_pos != ZERO))
{ {
rx = TO_DOUBLE(ep->param1.description->map.rot.x + rx = TO_DOUBLE(ADD(ep->param1.description->map.rot.x,
SCALE(ep->description_pos, MUL(ep->description_pos,
SUB(ep->param2->description->map.rot.x, SUB(ep->param2->description->map.rot.x,
ep->param1.description->map.rot.x))); ep->param1.description->map.rot.x))));
ry = TO_DOUBLE(ep->param1.description->map.rot.y + ry = TO_DOUBLE(ADD(ep->param1.description->map.rot.y,
SCALE(ep->description_pos, MUL(ep->description_pos,
SUB(ep->param2->description->map.rot.y, SUB(ep->param2->description->map.rot.y,
ep->param1.description->map.rot.y))); ep->param1.description->map.rot.y))));
rz = TO_DOUBLE(ep->param1.description->map.rot.z + rz = TO_DOUBLE(ADD(ep->param1.description->map.rot.z,
SCALE(ep->description_pos, MUL(ep->description_pos,
SUB(ep->param2->description->map.rot.z, SUB(ep->param2->description->map.rot.z,
ep->param1.description->map.rot.z))); ep->param1.description->map.rot.z))));
} }
else else
{ {