edje - don't update map uv for proxy

SVN revision: 78818
This commit is contained in:
ChunEon Park 2012-11-02 04:05:02 +00:00
parent 5b3ac2cb0c
commit 2fbf887eda
4 changed files with 9 additions and 1 deletions

View File

@ -671,3 +671,7 @@
2012-10-31 ChunEon Park (Hermet)
* Fix to update the text classes when text classes are changed.
2012-11-02 ChunEon Park (Hermet)
* Fix to not update map uv for proxy

View File

@ -27,6 +27,7 @@ Fixes:
* fix scale_set with edje containing groups
* fix edje_cc to use max, not default compression
* fix edje_text_class_set to update the text classes correctly.
* fix to not update map uv for proxy
Edje 1.7.0

View File

@ -3084,7 +3084,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
evas_map_util_points_populate_from_object(map, ep->object);
if (ep->part->type == EDJE_PART_TYPE_IMAGE ||
((ep->part->type == EDJE_PART_TYPE_SWALLOW) &&
(!strcmp(evas_object_type_get(mo), "image")))
(!strcmp(evas_object_type_get(mo), "image") &&
(!evas_object_image_source_get(mo))))
)
{
int iw = 1, ih = 1;

View File

@ -6378,6 +6378,8 @@ _edje_object_part_swallow_image_resize_cb(void *data, Evas *e __UNUSED__, Evas_O
Evas_Map *map;
if (!rp->chosen_description->map.on) return;
if (evas_object_image_source_get(rp->typedata.swallow->swallowed_object))
return;
if ((rp->type != EDJE_RP_TYPE_SWALLOW) ||
(!rp->typedata.swallow)) return;