kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Elm_Transit: deleting transit if there is no more objects 

After you add an object, if the objects list stay empty, the transit
will die

Author: Helen Fornazier <helen.fornazier@profusion.mobi>

SVN revision: 54415
This commit is contained in:
Tiago Rezende Campos Falcao 2010-11-10 18:05:39 +00:00
parent 86cd7f44aa
commit 98c82eb20f
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
legacy/elementary/src/lib/elm_transit.c
View File

@ -46,7 +46,8 @@ typedef struct _Elm_Effect Elm_Effect;
static void _transit_animate_op(Elm_Transit *transit, double progress); static void _transit_animate_op(Elm_Transit *transit, double progress);
static void _elm_transit_effect_del(Elm_Transit *transit, Elm_Effect *effect); static void _elm_transit_effect_del(Elm_Transit *transit, Elm_Effect *effect);
static void _remove_dead_effects(Elm_Transit *transit); static void _remove_dead_effects(Elm_Transit *transit);
static void _elm_transit_object_remove(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); static void _elm_transit_object_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
static void _elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj);
static double _animator_curve_linear(double progress); static double _animator_curve_linear(double progress);
static double _animator_curve_in_out(double progress); static double _animator_curve_in_out(double progress);
static double _animator_curve_in(double progress); static double _animator_curve_in(double progress);
@ -269,7 +270,7 @@ elm_transit_del(Elm_Transit *transit)
_elm_transit_effect_del(transit, effect); _elm_transit_effect_del(transit, effect);
while (transit->objs) while (transit->objs)
elm_transit_object_remove(transit, eina_list_data_get(transit->objs)); _elm_transit_object_remove(transit, eina_list_data_get(transit->objs));
free(transit); free(transit);
} }
@ -401,6 +402,10 @@ _animator_animate_cb(void *data)
/** /**
* Add new object to apply the effects * Add new object to apply the effects
* *
* @note After the first addition of an object in @p transit, if its
* object list become empty again, the @p transit will be killed by
* elm_transit_del(transit, obj) function.
*
* @param transit Transit object * @param transit Transit object
* @param obj Object * @param obj Object
* @return transit * @return transit
@ -426,16 +431,14 @@ elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj)
if (transit->block) if (transit->block)
evas_object_pass_events_set(obj, EINA_TRUE); evas_object_pass_events_set(obj, EINA_TRUE);
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _elm_transit_object_remove, transit); evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
_elm_transit_object_remove_cb, transit);
} }
static void static void
_elm_transit_object_remove(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) _elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj)
{ {
Elm_Transit *transit = data;
Eina_Bool *state; Eina_Bool *state;
if (!transit) return;
if (!obj) return;
state = evas_object_data_del(obj, _transit_key); state = evas_object_data_del(obj, _transit_key);
free(state); free(state);
@ -443,12 +446,26 @@ _elm_transit_object_remove(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
transit->objs = eina_list_remove(transit->objs, obj); transit->objs = eina_list_remove(transit->objs, obj);
evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
_elm_transit_object_remove); _elm_transit_object_remove_cb);
}
static void
_elm_transit_object_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *transit = data;
_elm_transit_object_remove(transit, obj);
if (!transit->objs)
elm_transit_del(transit);
} }
/** /**
* Removes an added object from the transit * Removes an added object from the transit
* *
* @note If the list become empty, this function will call
* elm_transit_del(transit, obj), that is, it will kill the @p transit.
*
* @param transit Transit object * @param transit Transit object
* @param obj Object * @param obj Object
* *
@ -457,7 +474,13 @@ _elm_transit_object_remove(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
EAPI void EAPI void
elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj) elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj)
{ {
_elm_transit_object_remove(transit, NULL, obj, NULL); if (!transit) return;
if (!obj) return;
_elm_transit_object_remove(transit, obj);
if (!transit->objs)
elm_transit_del(transit);
} }
/** /**