summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <chuneon.park@samsung.com>2015-03-02 20:19:49 +0900
committerChunEon Park <chuneon.park@samsung.com>2015-03-02 20:19:49 +0900
commitdf5f9f7c553e705e8415511c73070eddfb9f3343 (patch)
tree7501b5f0d232e7fb1addee2260190c51f5a35966
parent4673dbeb4bf134de9af6802895908492b5beb1b2 (diff)
edje: apply scale prior to rotation
As my experience, this tranform is likely expected by user.
-rw-r--r--src/lib/edje/edje_calc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 20569bf527..5cb890260f 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,
3069 } 3069 }
3070 } 3070 }
3071 3071
3072 //zoom
3073 evas_map_util_zoom(map,
3074 pf->map->zoom.x, pf->map->zoom.y,
3075 pf->map->center.x, pf->map->center.y);
3076
3072 //rotate 3077 //rotate
3073 evas_map_util_3d_rotate(map, 3078 evas_map_util_3d_rotate(map,
3074 TO_DOUBLE(pf->map->rotation.x), 3079 TO_DOUBLE(pf->map->rotation.x),
@@ -3112,9 +3117,6 @@ _edje_map_prop_set(Evas_Map *map, const Edje_Calc_Params *pf,
3112 // handle alpha 3117 // handle alpha
3113 if (chosen_desc->map.alpha) evas_map_alpha_set(map, EINA_TRUE); 3118 if (chosen_desc->map.alpha) evas_map_alpha_set(map, EINA_TRUE);
3114 else evas_map_alpha_set(map, EINA_FALSE); 3119 else evas_map_alpha_set(map, EINA_FALSE);
3115 evas_map_util_zoom(map,
3116 pf->map->zoom.x, pf->map->zoom.y,
3117 pf->map->center.x, pf->map->center.y);
3118} 3120}
3119 3121
3120#define Rel1X 0 3122#define Rel1X 0