From a657ed26785441531a593f41ed5d72d3e1bf522e Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Sun, 11 Mar 2012 10:43:08 +0000
Subject: [PATCH] edje: correctly propagate scale factor to GROUP.

SVN revision: 69189
---
 legacy/edje/ChangeLog           | 3 +++
 legacy/edje/NEWS                | 1 +
 legacy/edje/src/lib/edje_calc.c | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 64b6a99e36..d86c21241a 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/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/legacy/edje/NEWS b/legacy/edje/NEWS
index 2f00d0a4e8..49933d0fde 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/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/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 2738cb5fc5..5df066f5c7 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/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 ;