edje: correctly propagate scale factor to GROUP.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@69189 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 64b6a99..d86c212 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/NEWS b/NEWS
index 2f00d0a..49933d0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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:
 -------------------------

diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
index 2738cb5..5df066f 100644 (file)
--- a/src/lib/edje_calc.c
+++ b/src/lib/edje_calc.c
@@ -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 ;