diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 8a691ce83b..bb48a8aabd 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -640,3 +640,7 @@ 2012-10-25 Michael Bouchaud (yoz) * some fix for promote and demote in genlist + +2012-10-30 ChunEon Park (Hermet) + + * Fix the transit to accept proxy object. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index de605c7f53..c4fd15ce99 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -46,6 +46,7 @@ Fixes: * Fix on_focus_region() issue. * Fixed gengrid wrong_calc_job parameter. * Fix elm_transit image animation that last few frames are skipped. + * FIx elm_transit to accept proxy object. Removals: diff --git a/legacy/elementary/src/lib/elm_transit.c b/legacy/elementary/src/lib/elm_transit.c index f083033947..5b8025cc5a 100644 --- a/legacy/elementary/src/lib/elm_transit.c +++ b/legacy/elementary/src/lib/elm_transit.c @@ -418,6 +418,7 @@ _recover_image_uv(Evas_Object *obj, Evas_Map *map, Eina_Bool revert, Eina_Bool b int iw, ih; const char *type = evas_object_type_get(obj); if ((!type) || (strcmp(type, "image"))) return EINA_FALSE; + if (evas_object_image_source_get(obj)) return EINA_FALSE; evas_object_image_size_get(obj, &iw, &ih); @@ -1702,7 +1703,8 @@ _transit_effect_wipe_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double EINA_LIST_FOREACH(transit->objs, elist, obj) { type = evas_object_type_get(obj); - if ((!type) || (strcmp(type, "image"))) + if ((!type) || (strcmp(type, "image")) || + evas_object_image_source_get(obj)) evas_object_geometry_get(obj, &_x, &_y, &_w, &_h); else {