From: ChunEon Park <chuneon.park@samsung.com>
Date: Mon, 2 Mar 2015 11:19:49 +0000 (+0900)
Subject: edje: apply scale prior to rotation
X-Git-Tag: v1.14.0-alpha1~348
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df5f9f7c553e705e8415511c73070eddfb9f3343;p=platform%2Fupstream%2Fefl.git

edje: apply scale prior to rotation

As my experience, this tranform is likely expected by user.
---

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 20569bf..5cb8902 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3069,6 +3069,11 @@ _edje_map_prop_set(Evas_Map *map, const  Edje_Calc_Params *pf,
           }
      }
 
+   //zoom
+   evas_map_util_zoom(map,
+                      pf->map->zoom.x, pf->map->zoom.y,
+                      pf->map->center.x, pf->map->center.y);
+
    //rotate
    evas_map_util_3d_rotate(map,
                            TO_DOUBLE(pf->map->rotation.x),
@@ -3112,9 +3117,6 @@ _edje_map_prop_set(Evas_Map *map, const  Edje_Calc_Params *pf,
    // handle alpha
    if (chosen_desc->map.alpha) evas_map_alpha_set(map, EINA_TRUE);
    else evas_map_alpha_set(map, EINA_FALSE);
-   evas_map_util_zoom(map,
-                      pf->map->zoom.x, pf->map->zoom.y,
-                      pf->map->center.x, pf->map->center.y);
 }
 
 #define Rel1X 0