From 88b939541bc9e76953c60a70a59f5fed27890d12 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 18 Dec 2012 05:23:47 +0000 Subject: [PATCH] elementary/transit - now elm_transit image animation supports elm_image object type SVN revision: 81202 --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elm_transit.c | 11 ++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 837eed1d93..256110db72 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -822,3 +822,7 @@ 2012-12-17 Chueon Park (Hermet) * Makes naviframe safety even if someone deletes the naviframe in transition finished cb. + +2012-12-18 Chueon Park (Hermet) + + * Elm_transit image aniamtion effects supports elm_image object type. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index ce0e66d2d5..559f924c8f 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -38,6 +38,7 @@ Improvements: * Handle COMPOUND_TEXT cnp * Conformant widget handles displaymode change related with keypad. * Conformant widget handles indicator service. + * Elm_Transit image animation effects supports elm_image object type. Fixes: diff --git a/legacy/elementary/src/lib/elm_transit.c b/legacy/elementary/src/lib/elm_transit.c index 75944bd3ee..5d28df1f2c 100644 --- a/legacy/elementary/src/lib/elm_transit.c +++ b/legacy/elementary/src/lib/elm_transit.c @@ -2309,19 +2309,23 @@ _transit_effect_image_animation_op(Elm_Transit_Effect *effect, Elm_Transit *tran EINA_SAFETY_ON_NULL_RETURN(transit); Eina_List *elist; Evas_Object *obj; - const char *type; + const char *type, *type_deprecated; Elm_Transit_Effect_Image_Animation *image_animation = effect; unsigned int count = 0; int len; - type = eina_stringshare_add("elm_icon"); + type = eina_stringshare_add("elm_image"); + //FIXME: Remove later when elm_icon is cleared. + type_deprecated = eina_stringshare_add("elm_icon"); + len = eina_list_count(image_animation->images); if (len) { count = floor(progress * len); EINA_LIST_FOREACH(transit->objs, elist, obj) { - if (elm_widget_type_check(obj, type, __func__)) + if (elm_widget_type_check(obj, type, __func__) || + elm_widget_type_check(obj, type_deprecated, __func__)) elm_image_file_set(obj, eina_list_nth(image_animation->images, count), NULL); @@ -2329,6 +2333,7 @@ _transit_effect_image_animation_op(Elm_Transit_Effect *effect, Elm_Transit *tran } eina_stringshare_del(type); + eina_stringshare_del(type_deprecated); } static Elm_Transit_Effect *