forked from enlightenment/efl
elementary/transit - now elm_transit image animation supports elm_image object type
SVN revision: 81202
This commit is contained in:
parent
31c852ca9d
commit
88b939541b
|
@ -822,3 +822,7 @@
|
||||||
2012-12-17 Chueon Park (Hermet)
|
2012-12-17 Chueon Park (Hermet)
|
||||||
|
|
||||||
* Makes naviframe safety even if someone deletes the naviframe in transition finished cb.
|
* 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.
|
||||||
|
|
|
@ -38,6 +38,7 @@ Improvements:
|
||||||
* Handle COMPOUND_TEXT cnp
|
* Handle COMPOUND_TEXT cnp
|
||||||
* Conformant widget handles displaymode change related with keypad.
|
* Conformant widget handles displaymode change related with keypad.
|
||||||
* Conformant widget handles indicator service.
|
* Conformant widget handles indicator service.
|
||||||
|
* Elm_Transit image animation effects supports elm_image object type.
|
||||||
|
|
||||||
Fixes:
|
Fixes:
|
||||||
|
|
||||||
|
|
|
@ -2309,19 +2309,23 @@ _transit_effect_image_animation_op(Elm_Transit_Effect *effect, Elm_Transit *tran
|
||||||
EINA_SAFETY_ON_NULL_RETURN(transit);
|
EINA_SAFETY_ON_NULL_RETURN(transit);
|
||||||
Eina_List *elist;
|
Eina_List *elist;
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
const char *type;
|
const char *type, *type_deprecated;
|
||||||
Elm_Transit_Effect_Image_Animation *image_animation = effect;
|
Elm_Transit_Effect_Image_Animation *image_animation = effect;
|
||||||
unsigned int count = 0;
|
unsigned int count = 0;
|
||||||
int len;
|
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);
|
len = eina_list_count(image_animation->images);
|
||||||
if (len)
|
if (len)
|
||||||
{
|
{
|
||||||
count = floor(progress * len);
|
count = floor(progress * len);
|
||||||
EINA_LIST_FOREACH(transit->objs, elist, obj)
|
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,
|
elm_image_file_set(obj,
|
||||||
eina_list_nth(image_animation->images, count),
|
eina_list_nth(image_animation->images, count),
|
||||||
NULL);
|
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);
|
||||||
|
eina_stringshare_del(type_deprecated);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Elm_Transit_Effect *
|
static Elm_Transit_Effect *
|
||||||
|
|
Loading…
Reference in New Issue