aboutsummaryrefslogtreecommitdiffstats
path: root/legacy
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-08-14 08:04:06 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-08-14 08:04:06 +0000
commitb11b7c3ac49f338f90269164dda24f100f7c10d6 (patch)
tree29f49a478156f6914a330163a6a0e080742e524f /legacy
parentedje - clean up the code (diff)
downloadefl-b11b7c3ac49f338f90269164dda24f100f7c10d6.tar.gz
edje - fixe the uv mapping correctly in case of image swallowed case
SVN revision: 75241
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edje/ChangeLog4
-rw-r--r--legacy/edje/src/lib/edje_calc.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 28c7f364c9..b29316e0a2 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -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/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 115025edfd..ccf281c24f 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -2986,7 +2986,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;
@@ -2996,7 +2999,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);