diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 27b0e2aac1..22dbea7956 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -652,3 +652,7 @@ 2012-10-31 TaeHwan Kim (Bluezery) * Don't crash glview even if you failed to create obj. + +2012-11-02 ChunEon Park (Hermet) + + * Don't update map uv with image size for proxy object in elm_flip. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 3193c60d0f..ace70f6927 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -49,6 +49,7 @@ Fixes: * Fix elm_transit image animation that last few frames are skipped. * FIx elm_transit to accept proxy object. * Fix glview crash even if the object is failed allocating. + * Fix the elm_flip to accept proxy object. Removals: diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c index f7717189fe..d25d0dfecf 100644 --- a/legacy/elementary/src/lib/elm_flip.c +++ b/legacy/elementary/src/lib/elm_flip.c @@ -910,7 +910,8 @@ _flip_do(Evas_Object *obj, const char *type = evas_object_type_get(sd->front.content); // FIXME: only handles filled obj - if ((type) && (!strcmp(type, "image"))) + if ((type) && (!strcmp(type, "image") && + !evas_object_image_source_get(sd->front.content))) { int iw, ih; evas_object_image_size_get(sd->front.content, &iw, &ih); @@ -931,7 +932,8 @@ _flip_do(Evas_Object *obj, { const char *type = evas_object_type_get(sd->back.content); - if ((type) && (!strcmp(type, "image"))) + if ((type) && (!strcmp(type, "image") && + !evas_object_image_source_get(sd->front.content))) { int iw, ih; evas_object_image_size_get(sd->back.content, &iw, &ih);