From: ChunEon Park Date: Thu, 14 Jul 2011 06:13:19 +0000 (+0900) Subject: elm_transit - merged with the lastest opensource X-Git-Tag: REL_F_I9200_20110722_1~8^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60b034e5953bd4aae3fa425f191ad5a95d1d0896;p=framework%2Fuifw%2Felementary.git elm_transit - merged with the lastest opensource --- diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 4598123..08abf71 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -7124,6 +7124,13 @@ extern "C" { typedef void (*Elm_Transit_Effect_End_Cb) (Elm_Transit_Effect *effect, Elm_Transit *transit); /** + * Elm_Transit_Del_Cb + * + * A callback called when the transit is deleted. + */ + typedef void (*Elm_Transit_Del_Cb) (void *data, Elm_Transit *transit); + + /** * Add new transit. * * @note Is not necessary to delete the transit object, it will be deleted at @@ -7331,7 +7338,7 @@ extern "C" { * * @ingroup Transit */ - EAPI void elm_transit_del_cb_set(Elm_Transit *transit, void (*cb)(void *data, Elm_Transit* transit), void *data) EINA_ARG_NONNULL(1); + EAPI void elm_transit_del_cb_set(Elm_Transit *transit, Elm_Transit_Del_Cb cb, void *data) EINA_ARG_NONNULL(1); /** * Set reverse effect automatically. @@ -7524,6 +7531,21 @@ extern "C" { EAPI void elm_transit_chain_transit_add(Elm_Transit *transit, Elm_Transit *chain_transit) EINA_ARG_NONNULL(1, 2); /** + * Cut off the chain relationship between two transits. + * + * @note @p transit can not be NULL. Transit would have the chain relationship with @p chain transit. + * @note @p chain_transit can not be NULL. Chain transits should be chained to the @p transit. + * + * @param transit The transit object. + * @param chain_transit The chain transit object. + * + * This function remove the @p chain_transit transition from the @p transit. + * + * @ingroup Transit + */ + EAPI void elm_transit_chain_transit_del(Elm_Transit *transit, Elm_Transit *chain_transit) EINA_ARG_NONNULL(1,2); + + /** * Get the current chain transit list. * * @note @p transit can not be NULL. diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c index 6b653dc..02ecc7f 100644 --- a/src/lib/elm_transit.c +++ b/src/lib/elm_transit.c @@ -17,36 +17,6 @@ } \ } while (0) -/** - * - * @defgroup Transit Transit - * @ingroup Elementary - * - * Transit (see Warning below) is designed to set the various effects for the - * Evas_Object such like translation, rotation, etc. For using Effects, Create - * transit and insert effects which are interesting. - * Once effects are inserted into transit, transit will manage those effects. - * (ex deleting). - * - * Example: - * @code - * Elm_Transit *trans = elm_transit_add(); - * elm_transit_object_add(trans, obj); - * void *effect_context = elm_transit_effect_translation_context_new(0.0, 0.0, - * 280.0, 280.0); - * elm_transit_effect_add(transit, - * elm_transit_effect_translation_op, effect_context, - * elm_transit_effect_translation_context_free); - * elm_transit_duration_set(transit, 1); - * elm_transit_auto_reverse_set(transit, EINA_TRUE); - * elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE); - * elm_transit_repeat_times_set(transit, 3); - * @endcode - * - * @warning We strongly recomend to use elm_transit just when edje can not do - * the trick. Edje has more advantage than Elm_Transit, it has more flexibility and - * animations can be manipulated inside the theme. - */ #define _TRANSIT_FOCAL 2000 @@ -62,7 +32,7 @@ struct _Elm_Transit Eina_List *next_chain_transits; Elm_Transit_Tween_Mode tween_mode; struct { - Elm_Transit_Effect_End_Cb func; + Elm_Transit_Del_Cb func; void *arg; } del_data; struct { @@ -84,6 +54,7 @@ struct _Elm_Transit Eina_Bool event_enabled : 1; Eina_Bool deleted : 1; Eina_Bool state_keep : 1; + Eina_Bool finished : 1; }; struct _Elm_Transit_Effect_Module @@ -113,6 +84,7 @@ struct _Elm_Transit_Obj_Data typedef struct _Elm_Transit_Effect_Module Elm_Transit_Effect_Module; typedef struct _Elm_Transit_Obj_Data Elm_Transit_Obj_Data; typedef struct _Elm_Transit_Obj_State Elm_Transit_Obj_State; + static void _transit_obj_data_update(Elm_Transit *transit, Evas_Object *obj); static void _transit_obj_data_recover(Elm_Transit *transit, Evas_Object *obj); static void _transit_obj_states_save(Evas_Object *obj, Elm_Transit_Obj_Data *obj_data); @@ -121,7 +93,6 @@ static void _transit_obj_remove(Elm_Transit *transit, Evas_Object *obj); static void _transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module); static void _transit_remove_dead_effects(Elm_Transit *transit); static void _transit_del(Elm_Transit *transit); -static void _transit_chain_transits_go(Elm_Transit *transit); static void _transit_animate_op(Elm_Transit *transit, double progress); static Eina_Bool _transit_animate_cb(void *data); @@ -270,18 +241,10 @@ _transit_del(Elm_Transit *transit) Elm_Transit *chain_transit; Eina_List *elist, *elist_next; - EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) - { - if (transit->prev_chain_transit) - transit->prev_chain_transit->next_chain_transits = eina_list_remove(transit->prev_chain_transit->next_chain_transits, transit); - chain_transit->prev_chain_transit = NULL; - } - - eina_list_free(transit->next_chain_transits); - if (transit->animator) ecore_animator_del(transit->animator); + //remove effects while (transit->effect_list) { effect_module = EINA_INLIST_CONTAINER_GET(transit->effect_list, Elm_Transit_Effect_Module); @@ -289,6 +252,7 @@ _transit_del(Elm_Transit *transit) _transit_effect_del(transit, effect_module); } + //remove objects. while (transit->objs) _transit_obj_remove(transit, eina_list_data_get(transit->objs)); @@ -297,22 +261,25 @@ _transit_del(Elm_Transit *transit) if (transit->del_data.func) transit->del_data.func(transit->del_data.arg, transit); - EINA_MAGIC_SET(transit, EINA_MAGIC_NONE); - free(transit); -} + //cut off the chain transit relationship + EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) + chain_transit->prev_chain_transit = NULL; -static void -_transit_chain_transits_go(Elm_Transit *transit) -{ - Eina_List *elist, *elist_next; - Elm_Transit *chain_transit; - Evas_Object *obj; + if (transit->prev_chain_transit) + transit->prev_chain_transit->next_chain_transits = + eina_list_remove(transit->prev_chain_transit->next_chain_transits, transit); - EINA_LIST_FOREACH(transit->objs, elist, obj) - _transit_obj_data_recover(transit, obj); + // run chain transits + if (transit->finished && transit->next_chain_transits) + { + EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) + elm_transit_go(chain_transit); + } - EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) - elm_transit_go(chain_transit); + eina_list_free(transit->next_chain_transits); + + EINA_MAGIC_SET(transit, EINA_MAGIC_NONE); + free(transit); } static void @@ -377,10 +344,7 @@ _transit_animate_cb(void *data) (transit->repeat.current == transit->repeat.count) && ((!transit->auto_reverse) || transit->repeat.reverse)) { - /* run chain transit */ - if (transit->next_chain_transits) - _transit_chain_transits_go(transit); - + transit->finished = EINA_TRUE; elm_transit_del(transit); return ECORE_CALLBACK_CANCEL; } @@ -398,20 +362,6 @@ _transit_animate_cb(void *data) return ECORE_CALLBACK_RENEW; } -/** - * Add new transit. - * - * @note Is not necessary to delete the transit object, it will be deleted at - * the end of its operation. - * @note The transit will start playing when the program enter in the main loop, is not - * necessary to give a start to the transit. - * - * @param duration The duration of the transit in seconds. When transit starts - * to run, it will last a @p duration time. - * @return The transit object. - * - * @ingroup Transit - */ EAPI Elm_Transit * elm_transit_add(void) { @@ -429,22 +379,6 @@ elm_transit_add(void) return transit; } -/** - * Stops the animation and delete the @p transit object. - * - * Call this function if you wants to stop the animation before the duration - * time. Make sure the @p transit object is still alive with - * elm_transit_del_cb_set() function. - * All added effects will be deleted, calling its repective data_free_cb - * functions. The function setted by elm_transit_del_cb_set() will be called. - * - * @see elm_transit_del_cb_set() - * - * @param transit The transit object to be deleted. - * - * @ingroup Transit - * @warning Just call this function if you are sure the transit is alive. - */ EAPI void elm_transit_del(Elm_Transit *transit) { @@ -454,38 +388,6 @@ elm_transit_del(Elm_Transit *transit) else _transit_del(transit); } -/** - * Add a new effect to the transit. - * - * @note The cb function and the data are the key to the effect. If you try to - * add an already added effect, nothing is done. - * @note After the first addition of an effect in @p transit, if its - * effect list become empty again, the @p transit will be killed by - * elm_transit_del(transit) function. - * - * Exemple: - * @code - * Elm_Transit *transit = elm_transit_add(); - * elm_transit_effect_add(transit, - * elm_transit_effect_blend_op, - * elm_transit_effect_blend_context_new(), - * elm_transit_effect_blend_context_free); - * @endcode - * - * @param transit The transit object. - * @param cb The operation function. It is called when the animation begins, - * it is the function that actually performs the animation. It is called with - * the @p data, @p transit and the time progression of the animation (a double - * value between 0.0 and 1.0). - * @param data The context data of the effect. - * @param data_free_cb The function to free the context data, it will be called - * at the end of the effect, it must finalize the animation and free the - * @p data. - * - * @ingroup Transit - * @warning The transit free the context data at the and of the transition with - * the data_free_cb function, do not use the context data in another transit. - */ EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect, Elm_Transit_Effect_End_Cb end_cb) { @@ -514,24 +416,6 @@ elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb tr transit->effect_list = eina_inlist_append(transit->effect_list, (Eina_Inlist*) effect_module); } -/** - * Delete an added effect. - * - * This function will remove the effect from the @p transit, calling the - * data_free_cb to free the @p data. - * - * @see elm_transit_effect_add() - * - * @note If the effect is not found, nothing is done. - * @note If the effect list become empty, this function will call - * elm_transit_del(transit), that is, it will kill the @p transit. - * - * @param transit The transit object. - * @param cb The operation function. - * @param data The context data of the effect. - * - * @ingroup Transit - */ EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect) { @@ -558,27 +442,6 @@ elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb tr } } -/** - * 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) function. - * @note If the @p obj belongs to another transit, the @p obj will be - * removed from it and it will only belong to the @p transit. If the old - * transit stays without objects, it will die. - * @note When you add an object into the @p transit, its state from - * evas_object_pass_events_get(obj) is saved, and it is applied when the - * transit ends, if you change this state whith evas_object_pass_events_set() - * after add the object, this state will change again when @p transit stops to - * run. - * - * @param transit The transit object. - * @param obj Object to be animated. - * - * @ingroup Transit - * @warning It is not allowed to add a new object after transit begins to go. - */ EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj) { @@ -601,19 +464,6 @@ elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj) transit->objs = eina_list_append(transit->objs, obj); } -/** - * Removes an added object from the transit. - * - * @note If the @p obj is not in the @p transit, nothing is done. - * @note If the list become empty, this function will call - * elm_transit_del(transit), that is, it will kill the @p transit. - * - * @param transit The transit object. - * @param obj Object to be removed from @p transit. - * - * @ingroup Transit - * @warning It is not allowed to remove objects after transit begins to go. - */ EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj) { @@ -624,14 +474,6 @@ elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj) if (!transit->objs) elm_transit_del(transit); } -/** - * Get the objects of the transit. - * - * @param transit The transit object. - * @return a Eina_List with the objects from the transit. - * - * @ingroup Transit - */ EAPI const Eina_List * elm_transit_objects_get(const Elm_Transit *transit) { @@ -639,22 +481,6 @@ elm_transit_objects_get(const Elm_Transit *transit) return transit->objs; } -/** - * Set the event enabled when transit is operating. - * - * If @p enabled is EINA_TRUE, the objects of the transit will receives - * events from mouse and keyboard during the animation. - * @note When you add an object with elm_transit_object_add(), its state from - * evas_object_pass_events_get(obj) is saved, and it is applied when the - * transit ends, if you change this state with evas_object_pass_events_set() - * after adding the object, this state will change again when @p transit stops - * to run. - * - * @param transit The transit object. - * @param enabled Disable or enable. - * - * @ingroup Transit - */ EAPI void elm_transit_event_enabled_set(Elm_Transit *transit, Eina_Bool enabled) { @@ -671,17 +497,6 @@ elm_transit_event_enabled_set(Elm_Transit *transit, Eina_Bool enabled) evas_object_pass_events_set(obj, enabled); } -/** - * Get the value of event enabled status. - * - * @see elm_transit_event_enabled_set() - * - * @param transit The Transit object - * @return EINA_TRUE, when event is enabled. If @p transit is NULL - * EINA_FALSE is returned - * - * @ingroup Transit - */ EAPI Eina_Bool elm_transit_event_enabled_get(const Elm_Transit *transit) { @@ -689,62 +504,6 @@ elm_transit_event_enabled_get(const Elm_Transit *transit) return transit->event_enabled; } - -/** - * Set the event enabled when transit is operating. - * - * If @p disabled is EINA_TRUE, the objects of the transit will receives - * events from mouse and keyboard during the animation. - * @note When you add an object with elm_transit_object_add(), its state from - * evas_object_pass_events_get(obj) is saved, and it is applied when the - * transit ends, if you change this state with evas_object_pass_events_set() - * after add the object, this state will change again when @p transit stops to - * run. - * - * @see elm_transit_event_enabled_set() - * - * @param transit The transit object. - * @param disabled Disable or enable. - * - * @ingroup Transit - */ -EINA_DEPRECATED EAPI void -elm_transit_event_block_set(Elm_Transit *transit, Eina_Bool disabled) -{ - elm_transit_event_enabled_set(transit, disabled); -} - - -/** - * Get the value of event block enabled status. - * - * @see elm_transit_event_enabled_set(), elm_transit_event_enabled_get() - * - * @param transit The Transit object - * @return EINA_TRUE, when event is enabled. If @p transit is NULL - * EINA_FALSE is returned - * - * @ingroup Transit - */ -EINA_DEPRECATED EAPI Eina_Bool -elm_transit_event_block_get(const Elm_Transit *transit) -{ - return !elm_transit_event_enabled_get(transit); -} - -/** - * Set the user-callback function when the transit is deleted. - * - * @note Using this function twice will overwrite the first function setted. - * @note the @p transit object will be deleted after call @p cb function. - * - * @param transit The transit object. - * @param cb Callback function pointer. This function will be called before - * the deletion of the transit. - * @param data Callback funtion user data. It is the @p op parameter. - * - * @ingroup Transit - */ EAPI void elm_transit_del_cb_set(Elm_Transit *transit, void (*cb) (void *data, Elm_Transit *transit), void *data) { @@ -753,20 +512,6 @@ elm_transit_del_cb_set(Elm_Transit *transit, void (*cb) (void *data, Elm_Transit transit->del_data.arg = data; } -/** - * Set reverse effect automatically. - * - * If auto reverse is setted, after running the effects with the progress - * parameter from 0 to 1, it will call the effecs again with the progress - * from 1 to 0. The transit will last for a time iqual to (2 * duration * repeat), - * where the duration was setted with the function elm_transit_add and - * the repeat with the function elm_transit_repeat_times_set(). - * - * @param transit The transit object. - * @param reverse EINA_TRUE means the auto_reverse is on. - * - * @ingroup Transit - */ EAPI void elm_transit_auto_reverse_set(Elm_Transit *transit, Eina_Bool reverse) { @@ -774,17 +519,6 @@ elm_transit_auto_reverse_set(Elm_Transit *transit, Eina_Bool reverse) transit->auto_reverse = reverse; } -/** - * Get if the auto reverse is on. - * - * @see elm_transit_auto_reverse_set() - * - * @param transit The transit object. - * @return EINA_TRUE means auto reverse is on. If @p transit is NULL - * EINA_FALSE is returned - * - * @ingroup Transit - */ EAPI Eina_Bool elm_transit_auto_reverse_get(const Elm_Transit *transit) { @@ -792,21 +526,6 @@ elm_transit_auto_reverse_get(const Elm_Transit *transit) return transit->auto_reverse; } -/** - * Set the transit repeat count. Effect will be repeated by repeat count. - * - * This function sets the number of repetition the transit will run after - * the first one, that is, if @p repeat is 1, the transit will run 2 times. - * If the @p repeat is a negative number, it will repeat infinite times. - * - * @note If this function is called during the transit execution, the transit - * will run @p repeat times, ignoring the times it already performed. - * - * @param transit The transit object - * @param repeat Repeat count - * - * @ingroup Transit - */ EAPI void elm_transit_repeat_times_set(Elm_Transit *transit, int repeat) { @@ -815,17 +534,6 @@ elm_transit_repeat_times_set(Elm_Transit *transit, int repeat) transit->repeat.current = 0; } -/** - * Get the transit repeat count. - * - * @see elm_transit_repeat_times_set() - * - * @param transit The Transit object. - * @return The repeat count. If @p transit is NULL - * 0 is returned - * - * @ingroup Transit - */ EAPI int elm_transit_repeat_times_get(const Elm_Transit *transit) { @@ -833,20 +541,6 @@ elm_transit_repeat_times_get(const Elm_Transit *transit) return transit->repeat.count; } -/** - * Set the transit animation acceleration type. - * - * This function sets the tween mode of the transit that can be: - * ELM_TRANSIT_TWEEN_MODE_LINEAR - The default mode. - * ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL - Starts in accelerate mode and ends decelerating. - * ELM_TRANSIT_TWEEN_MODE_DECELERATE - The animation will be slowed over time. - * ELM_TRANSIT_TWEEN_MODE_ACCELERATE - The animation will accelerate over time. - * - * @param transit The transit object. - * @param tween_mode The tween type. - * - * @ingroup Transit - */ EAPI void elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mode) { @@ -854,17 +548,6 @@ elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mo transit->tween_mode = tween_mode; } -/** - * Get the transit animation acceleration type. - * - * @note @p transit can not be NULL - * - * @param transit The transit object. - * @return The tween type. If @p transit is NULL - * ELM_TRANSIT_TWEEN_MODE_LINEAR is returned. - * - * @ingroup Transit - */ EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit) { @@ -872,16 +555,6 @@ elm_transit_tween_mode_get(const Elm_Transit *transit) return transit->tween_mode; } -/** - * Set the transit animation time - * - * @note @p transit can not be NULL - * - * @param transit The transit object. - * @param duration The animation time. - * - * @ingroup Transit - */ EAPI void elm_transit_duration_set(Elm_Transit *transit, double duration) { @@ -894,17 +567,6 @@ elm_transit_duration_set(Elm_Transit *transit, double duration) transit->time.duration = duration; } -/** - * Get the transit animation time - * - * @note @p transit can not be NULL - * - * @param transit The transit object. - * - * @return The transit animation time. - * - * @ingroup Transit - */ EAPI double elm_transit_duration_get(const Elm_Transit *transit) { @@ -912,16 +574,6 @@ elm_transit_duration_get(const Elm_Transit *transit) return transit->time.duration; } -/** - * Starts the transition. - * Once this API is called, the transit begins to measure the time. - * - * @note @p transit can not be NULL - * - * @param transit The transit object. - * - * @ingroup Transit - */ EAPI void elm_transit_go(Elm_Transit *transit) { @@ -948,16 +600,6 @@ elm_transit_go(Elm_Transit *transit) transit->animator = ecore_animator_add(_transit_animate_cb, transit); } -/** - * Pause/Resume the transition. - * If you call elm_transit_go again, paused states will affect no anymore. - * - * @note @p transit can not be NULL - * - * @param transit The transit object. - * - * @ingroup Transit - */ EAPI void elm_transit_paused_set(Elm_Transit *transit, Eina_Bool paused) { @@ -982,19 +624,6 @@ elm_transit_paused_set(Elm_Transit *transit, Eina_Bool paused) } } -/** - * Get the value of paused status. - * - * @see elm_transit_paused_set() - * - * @note @p transit can not be NULL - * - * @param transit The transit object. - * @return EINA_TRUE means transition is paused. If @p transit is NULL - * EINA_FALSE is returned - * - * @ingroup Transit - */ EAPI Eina_Bool elm_transit_paused_get(const Elm_Transit *transit) { @@ -1006,18 +635,6 @@ elm_transit_paused_get(const Elm_Transit *transit) return EINA_TRUE; } -/** - * Get the time progression of the animation (a double value between 0.0 and 1.0). - * - * @note @p transit can not be NULL - * - * @param transit The transit object. - * - * @return The time progression value. If @p transit is NULL - * 0 is returned - * - * @ingroup Transit - */ EAPI double elm_transit_progress_value_get(const Elm_Transit *transit) { @@ -1026,20 +643,6 @@ elm_transit_progress_value_get(const Elm_Transit *transit) return transit->progress; } - - -/** - * Enable/disable keeping up the objects states. - * If it is not kept, the objects states will be reset when transition ends. - * - * @note @p transit can not be NULL. - * @note One state includes geometry, color, map data. - * - * @param transit The transit object. - * @param state_keep Keeping or Non Keeping. - * - * @ingroup Transit - */ EAPI void elm_transit_objects_final_state_keep_set(Elm_Transit *transit, Eina_Bool state_keep) { @@ -1054,19 +657,6 @@ elm_transit_objects_final_state_keep_set(Elm_Transit *transit, Eina_Bool state_k transit->state_keep = !!state_keep; } -/** - * Get a value whether the objects states will be reset or not. - * - * @note @p transit can not be NULL - * - * @see elm_transit_objects_final_state_keep_set() - * - * @param transit The transit object. - * @return EINA_TRUE means the states of the objects will be reset. - * If @p transit is NULL, EINA_FALSE is returned - * - * @ingroup Transit - */ EAPI Eina_Bool elm_transit_objects_final_state_keep_get(const Elm_Transit *transit) { @@ -1074,18 +664,6 @@ elm_transit_objects_final_state_keep_get(const Elm_Transit *transit) return transit->state_keep; } -/** - * Makes the chain relationship between two transits. - * - * @note @p transit can not be NULL. Transit would have multiple chain transits. - * @note @p chain_transit can not be NULL. Chain transits could be chained to the only one transit. - * - * @param transit The transit object. - * @param chain_transit The chain transit object. This transit will be operated - * after transit is done. - * - * @ingroup Transit - */ EAPI void elm_transit_chain_transit_add(Elm_Transit *transit, Elm_Transit *chain_transit) { @@ -1107,16 +685,22 @@ elm_transit_chain_transit_add(Elm_Transit *transit, Elm_Transit *chain_transit) transit->next_chain_transits = eina_list_append(transit->next_chain_transits, chain_transit); } -/** - * Get the current chain transit list. - * - * @note @p transit can not be NULL. - * - * @param transit The transit object. - * @return chain transit list. - * - * @ingroup Transit - */ +EAPI void +elm_transit_chain_transit_del(Elm_Transit *transit, Elm_Transit *chain_transit) +{ + ELM_TRANSIT_CHECK_OR_RETURN(transit); + ELM_TRANSIT_CHECK_OR_RETURN(chain_transit); + + if (chain_transit->prev_chain_transit != transit) + { + WRN("These two transit does not have the chain relationship! : transit=%p, chain_transit=%p", transit, chain_transit); + return; + } + + chain_transit->prev_chain_transit = NULL; + transit->next_chain_transits = eina_list_remove(transit->next_chain_transits, chain_transit); +} + EAPI Eina_List * elm_transit_chain_transits_get(const Elm_Transit * transit) { @@ -1176,23 +760,6 @@ _transit_effect_resizing_context_new(Evas_Coord from_w, Evas_Coord from_h, Evas_ return resizing; } -/** - * Add the Resizing Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates resizing effect context - * and add it's required APIs to elm_transit_effect_add. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param from_w Object width size when effect begins. - * @param from_h Object height size when effect begins. - * @param to_w Object width size when effect ends. - * @param to_h Object height size when effect ends. - * @return Resizing effect context data. - * - * @ingroup Transit - */ EAPI Elm_Transit_Effect * elm_transit_effect_resizing_add(Elm_Transit *transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h) { @@ -1331,27 +898,6 @@ _transit_effect_translation_context_new(Evas_Coord from_dx, Evas_Coord from_dy, return translation; } -/** - * Add the Translation Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates translation effect context - * and add it's required APIs to elm_transit_effect_add. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param from_dx X Position variation when effect begins. - * @param from_dy Y Position variation when effect begins. - * @param to_dx X Position variation when effect ends. - * @param to_dy Y Position variation when effect ends. - * @return Translation effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the geometry information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI Elm_Transit_Effect * elm_transit_effect_translation_add(Elm_Transit *transit, Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy) { @@ -1426,25 +972,6 @@ _transit_effect_zoom_context_new(float from_rate, float to_rate) return zoom; } -/** - * Add the Zoom Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates zoom effect context - * and add it's required APIs to elm_transit_effect_add. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param from_rate Scale rate when effect begins (1 is current rate). - * @param to_rate Scale rate when effect ends. - * @return Zoom effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the geometry information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI Elm_Transit_Effect * elm_transit_effect_zoom_add(Elm_Transit *transit, float from_rate, float to_rate) { @@ -1590,28 +1117,6 @@ _transit_effect_flip_context_new(Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw return flip; } -/** - * Add the Flip Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates flip effect context - * and add it's required APIs to elm_transit_effect_add. - * @note This effect is applied to each pair of objects in the order they are listed - * in the transit list of objects. The first object in the pair will be the - * "front" object and the second will be the "back" object. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param axis Flipping Axis(X or Y). - * @param cw Flipping Direction. EINA_TRUE is clock-wise. - * @return Flip effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the geometry information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI Elm_Transit_Effect * elm_transit_effect_flip_add(Elm_Transit *transit, Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw) { @@ -1895,28 +1400,6 @@ _transit_effect_resizable_flip_context_new(Elm_Transit_Effect_Flip_Axis axis, Ei return resizable_flip; } -/** - * Add the Resizable Flip Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates resizable flip effect context - * and add it's required APIs to elm_transit_effect_add. - * @note This effect is applied to each pair of objects in the order they are listed - * in the transit list of objects. The first object in the pair will be the - * "front" object and the second will be the "back" object. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param axis Flipping Axis(X or Y). - * @param cw Flipping Direction. EINA_TRUE is clock-wise. - * @return Resizable flip effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the geometry information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI Elm_Transit_Effect * elm_transit_effect_resizable_flip_add(Elm_Transit *transit, Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw) { @@ -2132,25 +1615,6 @@ _transit_effect_wipe_context_new(Elm_Transit_Effect_Wipe_Type type, Elm_Transit_ return wipe; } -/** - * Add the Wipe Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates wipe effect context - * and add it's required APIs to elm_transit_effect_add. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param type Wipe type. Hide or show. - * @param dir Wipe Direction. - * @return Wipe effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the geometry information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI void * elm_transit_effect_wipe_add(Elm_Transit *transit, Elm_Transit_Effect_Wipe_Type type, Elm_Transit_Effect_Wipe_Dir dir) { @@ -2229,27 +1693,6 @@ _transit_effect_color_context_new(unsigned int from_r, unsigned int from_g, unsi return color; } -/** - * Add the Color Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates color effect context - * and add it's required APIs to elm_transit_effect_add. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param from_r RGB R when effect begins. - * @param from_g RGB G when effect begins. - * @param from_b RGB B when effect begins. - * @param from_a RGB A when effect begins. - * @param to_r RGB R when effect ends. - * @param to_g RGB G when effect ends. - * @param to_b RGB B when effect ends. - * @param to_a RGB A when effect ends. - * @return Color effect context data. - * - * @ingroup Transit - */ EAPI Elm_Transit_Effect * elm_transit_effect_color_add(Elm_Transit *transit, unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a) { @@ -2443,26 +1886,6 @@ _transit_effect_fade_context_new(void) return fade; } -/** - * Add the Fade Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates fade effect context - * and add it's required APIs to elm_transit_effect_add. - * @note This effect is applied to each pair of objects in the order they are listed - * in the transit list of objects. The first object in the pair will be the - * "before" object and the second will be the "after" object. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @return Fade effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the color information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI Elm_Transit_Effect * elm_transit_effect_fade_add(Elm_Transit *transit) { @@ -2630,26 +2053,6 @@ _transit_effect_blend_context_new(void) return blend; } -/** - * Add the Blend Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates blend effect context - * and add it's required APIs to elm_transit_effect_add. - * @note This effect is applied to each pair of objects in the order they are listed - * in the transit list of objects. The first object in the pair will be the - * "before" object and the second will be the "after" object. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @return Blend effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the color information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI Elm_Transit_Effect * elm_transit_effect_blend_add(Elm_Transit *transit) { @@ -2732,25 +2135,6 @@ _transit_effect_rotation_context_new(float from_degree, float to_degree) return rotation; } -/** - * Add the Rotation Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates rotation effect context - * and add it's required APIs to elm_transit_effect_add. - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param from_degree Degree when effect begins. - * @param to_degree Degree when effect is ends. - * @return Rotation effect context data. - * - * @ingroup Transit - * @warning Is higher recommended just create a transit with this effect when - * the window that the objects of the transit belongs has already been created. - * This is because this effect needs the geometry information about the objects, - * and if the window was not created yet, it can get a wrong information. - */ EAPI Elm_Transit_Effect * elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree) { @@ -2835,40 +2219,6 @@ _transit_effect_image_animation_context_new(Eina_List *images) return image_animation; } -/** - * Add the ImageAnimation Effect to Elm_Transit. - * - * @note This API is one of the facades. It creates image animation effect context - * and add it's required APIs to elm_transit_effect_add. - * The @p images parameter is a list images paths. This list and - * its contents will be deleted at the end of the effect by - * elm_transit_effect_image_animation_context_free() function. - * - * Example: - * @code - * char buf[PATH_MAX]; - * Eina_List *images = NULL; - * Elm_Transit *transi = elm_transit_add(); - * - * snprintf(buf, sizeof(buf), "%s/images/icon_11.png", PACKAGE_DATA_DIR); - * images = eina_list_append(images, eina_stringshare_add(buf)); - * - * snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); - * images = eina_list_append(images, eina_stringshare_add(buf)); - * elm_transit_effect_image_animation_add(transi, images); - * - * @endcode - * - * @see elm_transit_effect_add() - * - * @param transit Transit object. - * @param images Eina_List of images file paths. This list and - * its contents will be deleted at the end of the effect by - * elm_transit_effect_image_animation_context_free() function. - * @return Image Animation effect context data. - * - * @ingroup Transit - */ EAPI Elm_Transit_Effect * elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images) {