forked from enlightenment/efl
edje: correctly propagate scale factor to GROUP.
SVN revision: 69189
This commit is contained in:
parent
644a634214
commit
a657ed2678
|
@ -388,3 +388,6 @@
|
||||||
* Correctly count and propagate preload signal with GROUP.
|
* Correctly count and propagate preload signal with GROUP.
|
||||||
* Fix rotation with fixed point.
|
* Fix rotation with fixed point.
|
||||||
|
|
||||||
|
2012-03-11 Cedric Bail
|
||||||
|
|
||||||
|
* Propagate scale factor to GROUP's part.
|
||||||
|
|
|
@ -25,6 +25,7 @@ Improvements:
|
||||||
Fixes:
|
Fixes:
|
||||||
* Correctly count and propagate preload signal with GROUP.
|
* Correctly count and propagate preload signal with GROUP.
|
||||||
* Fix rotation with fixed point.
|
* Fix rotation with fixed point.
|
||||||
|
* Correctly propagate scale factor to GROUP.
|
||||||
|
|
||||||
Changes since Edje 1.0.0:
|
Changes since Edje 1.0.0:
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
|
@ -1906,7 +1906,7 @@ _edje_part_recalc_single(Edje *ed,
|
||||||
sc = ed->scale;
|
sc = ed->scale;
|
||||||
if (sc == ZERO) sc = _edje_scale;
|
if (sc == ZERO) sc = _edje_scale;
|
||||||
_edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh);
|
_edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh);
|
||||||
|
|
||||||
/* relative coords of top left & bottom right */
|
/* 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);
|
_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
|
#endif
|
||||||
return;
|
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
|
#ifdef EDJE_CALC_CACHE
|
||||||
if (ep->state == ed->state && !state)
|
if (ep->state == ed->state && !state)
|
||||||
return ;
|
return ;
|
||||||
|
|
Loading…
Reference in New Issue