diff options
| author | hermet <hermet@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> | 2012-08-14 08:04:06 +0000 |
|---|---|---|
| committer | ChunEon Park <chuneon.park@samsung.com> | 2012-08-21 16:14:38 +0900 |
| commit | b1e991a62c72cf7ebf2e185ef4d4380ed9f52356 (patch) | |
| tree | 9b6d78508e0049f00003da1de3882292a529a1ac | |
| parent | 687225619828f191c7cc53b1269c4e43f102e202 (diff) | |
| download | edje-b1e991a62c72cf7ebf2e185ef4d4380ed9f52356.tar.gz edje-b1e991a62c72cf7ebf2e185ef4d4380ed9f52356.tar.bz2 edje-b1e991a62c72cf7ebf2e185ef4d4380ed9f52356.zip | |
edje - fixe the uv mapping correctly in case of image swallowed case
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@75241 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/edje_calc.c | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -552,3 +552,7 @@ 2012-08-09 Cedric Bail * Improve speed of color_class lookup by using an Eina_Hash. + +2012-08-14 Hermet + + * Fix the uv mapping correctly in case of image swallowed. diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c index 8d57e52..569c5a5 100644 --- a/src/lib/edje_calc.c +++ b/src/lib/edje_calc.c @@ -2968,7 +2968,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta // create map and populate with part geometry if (!map) map = evas_map_new(4); evas_map_util_points_populate_from_object(map, ep->object); - if (ep->part->type == EDJE_PART_TYPE_IMAGE) + if (ep->part->type == EDJE_PART_TYPE_IMAGE || + ((ep->part->type == EDJE_PART_TYPE_SWALLOW) && + (!strcmp(evas_object_type_get(mo), "image"))) + ) { int iw = 1, ih = 1; @@ -2978,7 +2981,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta evas_map_point_image_uv_set(map, 2, iw , ih ); evas_map_point_image_uv_set(map, 3, 0.0, ih ); } - evas_map_util_3d_rotate(map, TO_DOUBLE(pf->map.rotation.x), TO_DOUBLE(pf->map.rotation.y), TO_DOUBLE(pf->map.rotation.z), pf->map.center.x, pf->map.center.y, pf->map.center.z); |