projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4673dbe
)
edje: apply scale prior to rotation
author
ChunEon Park
<chuneon.park@samsung.com>
Mon, 2 Mar 2015 11:19:49 +0000
(20:19 +0900)
committer
ChunEon Park
<chuneon.park@samsung.com>
Mon, 2 Mar 2015 11:19:49 +0000
(20:19 +0900)
As my experience, this tranform is likely expected by user.
src/lib/edje/edje_calc.c
patch
|
blob
|
history
diff --git
a/src/lib/edje/edje_calc.c
b/src/lib/edje/edje_calc.c
index
20569bf
..
5cb8902
100644
(file)
--- 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