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

edje: correctly propagate scale factor to GROUP. 

SVN revision: 69189
This commit is contained in:
Cedric BAIL 2012-03-11 10:43:08 +00:00
parent 644a634214
commit a657ed2678
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/edje/ChangeLog
View File

@ -388,3 +388,6 @@
* Correctly count and propagate preload signal with GROUP.
* Fix rotation with fixed point.
2012-03-11 Cedric Bail
* Propagate scale factor to GROUP's part.

1
legacy/edje/NEWS
View File

@ -25,6 +25,7 @@ Improvements:
Fixes:
* Correctly count and propagate preload signal with GROUP.
* Fix rotation with fixed point.
* Correctly propagate scale factor to GROUP.
Changes since Edje 1.0.0:
-------------------------

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

@ -1906,7 +1906,7 @@ _edje_part_recalc_single(Edje *ed,
sc = ed->scale;
if (sc == ZERO) sc = _edje_scale;
_edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh);
/* relative coords of top left & bottom right */
_edje_part_recalc_single_rel(ed, ep, desc, rel1_to_x, rel1_to_y, rel2_to_x, rel2_to_y, params);
@ -2282,6 +2282,12 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
#endif
return;
}
if (ep->part->scale &&
ep->part->type == EDJE_PART_TYPE_GROUP &&
ep->swallowed_object)
edje_object_scale_set(ep->swallowed_object, TO_DOUBLE(ed->scale));
#ifdef EDJE_CALC_CACHE
if (ep->state == ed->state && !state)
return ;