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 {
Eina_Bool event_enabled : 1;
Eina_Bool deleted : 1;
Eina_Bool state_keep : 1;
+ Eina_Bool finished : 1;
};
struct _Elm_Transit_Effect_Module
struct _Elm_Transit_Obj_Data
{
struct _Elm_Transit_Obj_State *state;
- Eina_Bool pass_events : 1;
+ Eina_Bool freeze_events : 1;
};
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 _elm_transit_obj_data_update(Elm_Transit *transit, Evas_Object *obj);
-static void _elm_transit_obj_data_recover(Elm_Transit *transit, Evas_Object *obj);
-static void _elm_transit_obj_states_save(Evas_Object *obj, Elm_Transit_Obj_Data *obj_data);
-static void _elm_transit_obj_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
-static void _obj_damage_area_set(Evas_Object *obj);
-static void _elm_transit_obj_remove(Elm_Transit *transit, Evas_Object *obj);
-static void _elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module);
-static void _remove_dead_effects(Elm_Transit *transit);
-static void _elm_transit_del(Elm_Transit *transit);
-static void _chain_transits_go(Elm_Transit *transit);
-static void _transit_animate_op(Elm_Transit *transit, double progress);
-static Eina_Bool _animator_animate_cb(void *data);
+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);
+static void _transit_obj_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
+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_chain_go(Elm_Transit *transit);
+static void _transit_del(Elm_Transit *transit);
+static Eina_Bool _transit_animate_op(Elm_Transit *transit, double progress);
+static Eina_Bool _transit_animate_cb(void *data);
static char *_transit_key= "_elm_transit_key";
static void
-_elm_transit_obj_data_update(Elm_Transit *transit, Evas_Object *obj)
+_transit_obj_data_update(Elm_Transit *transit, Evas_Object *obj)
{
Elm_Transit_Obj_Data *obj_data = evas_object_data_get(obj, _transit_key);
if (!obj_data)
obj_data = ELM_NEW(Elm_Transit_Obj_Data);
- obj_data->pass_events = evas_object_pass_events_get(obj);
+ obj_data->freeze_events = evas_object_freeze_events_get(obj);
if ((!transit->state_keep) && (obj_data->state))
{
}
else
{
- _elm_transit_obj_states_save(obj, obj_data);
+ _transit_obj_states_save(obj, obj_data);
}
evas_object_data_set(obj, _transit_key, obj_data);
}
static void
-_elm_transit_obj_states_save(Evas_Object *obj, Elm_Transit_Obj_Data *obj_data)
+_transit_obj_states_save(Evas_Object *obj, Elm_Transit_Obj_Data *obj_data)
{
Elm_Transit_Obj_State *state = obj_data->state;
break;
transit->objs = eina_list_remove(transit->objs, obj);
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL,
- _elm_transit_obj_remove_cb,
+ _transit_obj_remove_cb,
transit);
}
}
static void
-_elm_transit_obj_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_transit_obj_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *transit = data;
Elm_Transit_Obj_Data *obj_data = evas_object_data_get(obj, _transit_key);
if (!transit->objs) elm_transit_del(transit);
}
-//TODO: Remove!
-//Since evas map have a afterimage bug for this time.
-//This function is added temporary.
static void
-_obj_damage_area_set(Evas_Object *obj)
-{
- const Evas_Map *map;
- Evas_Coord_Point coords;
- Evas_Coord_Point min, max;
- int i;
-
- map = evas_object_map_get(obj);
- if (!map) return;
-
- evas_map_point_coord_get(map, 0, &coords.x, &coords.y, NULL);
-
- max = min = coords;
-
- for (i = 1; i < 4; ++i)
- {
- evas_map_point_coord_get(map, i, &coords.x, &coords.y, NULL);
-
- if (coords.x < min.x)
- min.x = coords.x;
- else if (coords.x > max.x)
- max.x = coords.x;
-
- if (coords.y < min.y)
- min.y = coords.y;
- else if (coords.y > max.y)
- max.y = coords.y;
- }
-
- evas_damage_rectangle_add(evas_object_evas_get(obj),
- min.x, min.y,
- max.x - min.x, max.y - min.y);
-}
-
-static void
-_elm_transit_obj_data_recover(Elm_Transit *transit, Evas_Object *obj)
+_transit_obj_data_recover(Elm_Transit *transit, Evas_Object *obj)
{
Elm_Transit_Obj_Data *obj_data;
Elm_Transit_Obj_State *state;
obj_data = evas_object_data_get(obj, _transit_key);
if (!obj_data) return;
evas_object_data_del(obj, _transit_key);
- evas_object_pass_events_set(obj, obj_data->pass_events);
+ evas_object_freeze_events_set(obj, obj_data->freeze_events);
state = obj_data->state;
if (state)
{
evas_object_map_enable_set(obj, EINA_FALSE);
if (state->map)
evas_object_map_set(obj, state->map);
-
- //TODO: Remove!
- //Since evas map have a afterimage bug for this time.
- //This line is added temporary.
- _obj_damage_area_set(obj);
-
}
free(state);
}
}
static void
-_elm_transit_obj_remove(Elm_Transit *transit, Evas_Object *obj)
+_transit_obj_remove(Elm_Transit *transit, Evas_Object *obj)
{
_remove_obj_from_list(transit, obj);
- _elm_transit_obj_data_recover(transit, obj);
+ _transit_obj_data_recover(transit, obj);
}
static void
-_elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module)
+_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module)
{
if (effect_module->end_cb)
effect_module->end_cb(effect_module->effect, transit);
}
static void
-_remove_dead_effects(Elm_Transit *transit)
+_transit_remove_dead_effects(Elm_Transit *transit)
{
Elm_Transit_Effect_Module *effect_module;
{
if (effect_module->deleted)
{
- _elm_transit_effect_del(transit, effect_module);
+ _transit_effect_del(transit, effect_module);
transit->effects_pending_del--;
if (!transit->effects_pending_del) return;
}
}
static void
-_elm_transit_del(Elm_Transit *transit)
+_transit_chain_go(Elm_Transit *transit)
+{
+ ELM_TRANSIT_CHECK_OR_RETURN(transit);
+ elm_transit_go(transit);
+ _transit_animate_cb(transit);
+}
+
+static void
+_transit_del(Elm_Transit *transit)
{
Elm_Transit_Effect_Module *effect_module;
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);
transit->effect_list = eina_inlist_remove(transit->effect_list, transit->effect_list);
- _elm_transit_effect_del(transit, effect_module);
+ _transit_effect_del(transit, effect_module);
}
+ //remove objects.
while (transit->objs)
- _elm_transit_obj_remove(transit, eina_list_data_get(transit->objs));
+ _transit_obj_remove(transit, eina_list_data_get(transit->objs));
transit->deleted = EINA_TRUE;
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
-_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)
- _elm_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)
+ _transit_chain_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
+//If the transit is deleted then EINA_FALSE is retruned.
+static Eina_Bool
_transit_animate_op(Elm_Transit *transit, double progress)
{
Elm_Transit_Effect_Module *effect_module;
}
transit->walking--;
- if (transit->walking) return;
+ if (transit->walking) return EINA_TRUE;
- if (transit->deleted) _elm_transit_del(transit);
- else if (transit->effects_pending_del) _remove_dead_effects(transit);
+ if (transit->deleted)
+ {
+ _transit_del(transit);
+ return EINA_FALSE;
+ }
+
+ else if (transit->effects_pending_del) _transit_remove_dead_effects(transit);
+
+ return EINA_TRUE;
}
static Eina_Bool
-_animator_animate_cb(void *data)
+_transit_animate_cb(void *data)
{
Elm_Transit *transit = data;
double elapsed_time, duration;
transit->progress = elapsed_time / duration;
switch (transit->tween_mode)
{
+ case ELM_TRANSIT_TWEEN_MODE_LINEAR:
+ transit->progress = ecore_animator_pos_map(transit->progress,
+ ECORE_POS_MAP_LINEAR,
+ 0, 0);
case ELM_TRANSIT_TWEEN_MODE_ACCELERATE:
- transit->progress = 1.0 - sin((ELM_PI / 2.0) + (transit->progress * ELM_PI / 2.0));
- break;
+ transit->progress = ecore_animator_pos_map(transit->progress,
+ ECORE_POS_MAP_ACCELERATE,
+ 0, 0);
+ break;
case ELM_TRANSIT_TWEEN_MODE_DECELERATE:
- transit->progress = sin(transit->progress * ELM_PI / 2.0);
- break;
+ transit->progress = ecore_animator_pos_map(transit->progress,
+ ECORE_POS_MAP_DECELERATE,
+ 0, 0);
+ break;
case ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL:
- transit->progress = (1.0 - cos(transit->progress * ELM_PI)) / 2.0;
- break;
+ transit->progress = ecore_animator_pos_map(transit->progress,
+ ECORE_POS_MAP_SINUSOIDAL,
+ 0, 0);
+ break;
default:
- break;
+ break;
}
/* Reverse? */
if (transit->repeat.reverse) transit->progress = 1 - transit->progress;
- if (transit->time.duration > 0) _transit_animate_op(transit, transit->progress);
+ if (transit->time.duration > 0)
+ {
+ if (!_transit_animate_op(transit, transit->progress))
+ return ECORE_CALLBACK_CANCEL;
+ }
/* Not end. Keep going. */
if (elapsed_time < duration) return ECORE_CALLBACK_RENEW;
(transit->repeat.current == transit->repeat.count) &&
((!transit->auto_reverse) || transit->repeat.reverse))
{
- /* run chain transit */
- if (transit->next_chain_transits)
- _chain_transits_go(transit);
-
+ transit->finished = EINA_TRUE;
elm_transit_del(transit);
return ECORE_CALLBACK_CANCEL;
}
elm_transit_add(void)
{
Elm_Transit *transit = ELM_NEW(Elm_Transit);
- if (!transit) return NULL;
+ if (!transit)
+ {
+ ERR("Failed to allocate a elm_transit object!");
+ return NULL;
+ }
EINA_MAGIC_SET(transit, ELM_TRANSIT_MAGIC);
ELM_TRANSIT_CHECK_OR_RETURN(transit);
if (transit->walking) transit->deleted = EINA_TRUE;
- else _elm_transit_del(transit);
+ else _transit_del(transit);
}
EAPI void
Elm_Transit_Effect_Module *effect_module;
EINA_INLIST_FOREACH(transit->effect_list, effect_module)
- if ((effect_module->transition_cb == transition_cb) && (effect_module->effect == effect)) return;
+ if ((effect_module->transition_cb == transition_cb) && (effect_module->effect == effect))
+ {
+ WRN("elm_transit does not allow to add the duplicated effect! : transit=%p", transit);
+ return;
+ }
effect_module = ELM_NEW(Elm_Transit_Effect_Module);
- if (!effect_module) return;
+ if (!effect_module)
+ {
+ ERR("Failed to allocate a new effect!: transit=%p", transit);
+ return;
+ }
effect_module->end_cb = end_cb;
effect_module->transition_cb = transition_cb;
}
else
{
- _elm_transit_effect_del(transit, effect_module);
+ _transit_effect_del(transit, effect_module);
if (!transit->effect_list) elm_transit_del(transit);
}
return;
{
if (!evas_object_data_get(obj, _transit_key))
{
- _elm_transit_obj_data_update(transit, obj);
- evas_object_pass_events_set(obj, EINA_TRUE);
+ _transit_obj_data_update(transit, obj);
+ evas_object_freeze_events_set(obj, EINA_TRUE);
}
}
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
- _elm_transit_obj_remove_cb,
+ _transit_obj_remove_cb,
transit);
transit->objs = eina_list_append(transit->objs, obj);
ELM_TRANSIT_CHECK_OR_RETURN(transit);
EINA_SAFETY_ON_NULL_RETURN(obj);
- _elm_transit_obj_remove(transit, obj);
+ _transit_obj_remove(transit, obj);
if (!transit->objs) elm_transit_del(transit);
}
if (!transit->animator) return;
EINA_LIST_FOREACH(transit->objs, list, obj)
- evas_object_pass_events_set(obj, enabled);
+ evas_object_freeze_events_set(obj, enabled);
}
EAPI Eina_Bool
elm_transit_duration_set(Elm_Transit *transit, double duration)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit);
- if (transit->animator) return;
+ if (transit->animator)
+ {
+ WRN("elm_transit does not allow to set the duration time in operating! : transit=%p", transit);
+ return;
+ }
transit->time.duration = duration;
}
ecore_animator_del(transit->animator);
EINA_LIST_FOREACH(transit->objs, elist, obj)
- _elm_transit_obj_data_update(transit, obj);
+ _transit_obj_data_update(transit, obj);
if (!transit->event_enabled)
{
EINA_LIST_FOREACH(transit->objs, elist, obj)
- evas_object_pass_events_set(obj, EINA_TRUE);
+ evas_object_freeze_events_set(obj, EINA_TRUE);
}
transit->time.paused = 0;
transit->time.delayed = 0;
transit->time.begin = ecore_loop_time_get();
- transit->animator = ecore_animator_add(_animator_animate_cb, transit);
+ transit->animator = ecore_animator_add(_transit_animate_cb, transit);
}
EAPI void
ELM_TRANSIT_CHECK_OR_RETURN(transit);
if (transit->state_keep == state_keep) return;
- if (transit->animator) return;
+ if (transit->animator)
+ {
+ WRN("elm_transit does not allow to change final state keep mode in operating! : transit=%p", transit);
+ return;
+ }
transit->state_keep = !!state_keep;
}
ELM_TRANSIT_CHECK_OR_RETURN(transit);
ELM_TRANSIT_CHECK_OR_RETURN(chain_transit);
- if (transit == chain_transit) return;
- if (transit == chain_transit->prev_chain_transit) return;
+ if (transit == chain_transit)
+ {
+ WRN("You add a same transit as a chain transit! : transit=%p, chain_transit=%p", transit, chain_transit);
+ return;
+ }
+ if (transit == chain_transit->prev_chain_transit)
+ return;
if (chain_transit->prev_chain_transit)
chain_transit->prev_chain_transit->next_chain_transits = eina_list_remove(chain_transit->prev_chain_transit->next_chain_transits, chain_transit);
transit->next_chain_transits = eina_list_append(transit->next_chain_transits, chain_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("A pair of transits 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)
{
return transit->next_chain_transits;
}
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Resizing Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Resizing Elm_Transit_Effect_Resizing;
struct _Elm_Transit_Effect_Resizing
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
Elm_Transit_Effect *effect = _transit_effect_resizing_context_new(from_w, from_h, to_w, to_h);
- if (!effect) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate resizing effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
_transit_effect_resizing_op, effect,
_transit_effect_resizing_context_free);
return effect;
}
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Translation Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Translation Elm_Transit_Effect_Translation;
typedef struct _Elm_Transit_Effect_Translation_Node Elm_Transit_Effect_Translation_Node;
elm_transit_effect_translation_add(Elm_Transit *transit, Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_translation_context_new(from_dx, from_dy, to_dx, to_dy);
+ Elm_Transit_Effect *effect = _transit_effect_translation_context_new(from_dx, from_dy, to_dx, to_dy);
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate translation effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_translation_op, effect_context,
+ _transit_effect_translation_op, effect,
_transit_effect_translation_context_free);
- return effect_context;
+ return effect;
}
-
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Zoom Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Zoom Elm_Transit_Effect_Zoom;
struct _Elm_Transit_Effect_Zoom
elm_transit_effect_zoom_add(Elm_Transit *transit, float from_rate, float to_rate)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_zoom_context_new(from_rate, to_rate);
+ Elm_Transit_Effect *effect = _transit_effect_zoom_context_new(from_rate, to_rate);
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate zoom effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_zoom_op, effect_context,
+ _transit_effect_zoom_op, effect,
_transit_effect_zoom_context_free);
- return effect_context;
+ return effect;
}
-
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Flip Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Flip Elm_Transit_Effect_Flip;
struct _Elm_Transit_Effect_Flip
elm_transit_effect_flip_add(Elm_Transit *transit, Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_flip_context_new(axis, cw);
+ Elm_Transit_Effect *effect = _transit_effect_flip_context_new(axis, cw);
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate flip effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_flip_op, effect_context,
+ _transit_effect_flip_op, effect,
_transit_effect_flip_context_free);
- return effect_context;
+ return effect;
}
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//ResizableFlip Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Resizable_Flip Elm_Transit_Effect_ResizableFlip;
typedef struct _Elm_Transit_Effect_Resizable_Flip_Node Elm_Transit_Effect_ResizableFlip_Node;
elm_transit_effect_resizable_flip_add(Elm_Transit *transit, Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_resizable_flip_context_new(axis, cw);
+ Elm_Transit_Effect *effect = _transit_effect_resizable_flip_context_new(axis, cw);
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate resizable_flip effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_resizable_flip_op, effect_context,
+ _transit_effect_resizable_flip_op, effect,
_transit_effect_resizable_flip_context_free);
- return effect_context;
+ return effect;
}
-
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Wipe Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Wipe Elm_Transit_Effect_Wipe;
struct _Elm_Transit_Effect_Wipe
elm_transit_effect_wipe_add(Elm_Transit *transit, Elm_Transit_Effect_Wipe_Type type, Elm_Transit_Effect_Wipe_Dir dir)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- void *effect_context = _transit_effect_wipe_context_new(type, dir);
+ void *effect = _transit_effect_wipe_context_new(type, dir);
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate wipe effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_wipe_op, effect_context,
+ _transit_effect_wipe_op, effect,
_transit_effect_wipe_context_free);
- return effect_context;
+ return effect;
}
-
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Color Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Color Elm_Transit_Effect_Color;
struct _Elm_Transit_Effect_Color
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)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_color_context_new(from_r, from_g, from_b, from_a, to_r, to_g, to_b, to_a);
+ Elm_Transit_Effect *effect = _transit_effect_color_context_new(from_r, from_g, from_b, from_a, to_r, to_g, to_b, to_a);
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate color effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_color_op, effect_context,
+ _transit_effect_color_op, effect,
_transit_effect_color_context_free);
- return effect_context;
+ return effect;
}
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Fade Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Fade Elm_Transit_Effect_Fade;
typedef struct _Elm_Transit_Effect_Fade_Node Elm_Transit_Effect_Fade_Node;
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_fade_context_new();
- if (!effect_context) return NULL;
+ Elm_Transit_Effect *effect = _transit_effect_fade_context_new();
+
+ if (!effect)
+ {
+ ERR("Failed to allocate fade effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_fade_op, effect_context,
+ _transit_effect_fade_op, effect,
_transit_effect_fade_context_free);
- return effect_context;
+ return effect;
}
-
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Blend Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Blend Elm_Transit_Effect_Blend;
typedef struct _Elm_Transit_Effect_Blend_Node Elm_Transit_Effect_Blend_Node;
elm_transit_effect_blend_add(Elm_Transit *transit)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_blend_context_new();
+ Elm_Transit_Effect *effect = _transit_effect_blend_context_new();
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate blend effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_blend_op, effect_context,
+ _transit_effect_blend_op, effect,
_transit_effect_blend_context_free);
- return effect_context;
+ return effect;
}
-
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//Rotation Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Rotation Elm_Transit_Effect_Rotation;
struct _Elm_Transit_Effect_Rotation
elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree)
{
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
- Elm_Transit_Effect *effect_context = _transit_effect_rotation_context_new(from_degree, to_degree);
+ Elm_Transit_Effect *effect = _transit_effect_rotation_context_new(from_degree, to_degree);
- if (!effect_context) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate rotation effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
- _transit_effect_rotation_op, effect_context,
+ _transit_effect_rotation_op, effect,
_transit_effect_rotation_context_free);
- return effect_context;
+ return effect;
}
-
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
//ImageAnimation Effect
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
typedef struct _Elm_Transit_Effect_Image_Animation Elm_Transit_Effect_Image_Animation;
struct _Elm_Transit_Effect_Image_Animation
EINA_LIST_FOREACH(transit->objs, elist, obj)
{
- if (elm_widget_type_check(obj, type))
+ if (elm_widget_type_check(obj, type, __func__))
elm_icon_file_set(obj,
eina_list_nth(image_animation->images, count), NULL);
}
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
Elm_Transit_Effect *effect = _transit_effect_image_animation_context_new(images);
- if (!effect) return NULL;
+ if (!effect)
+ {
+ ERR("Failed to allocate image_animation effect! : transit=%p", transit);
+ return NULL;
+ }
elm_transit_effect_add(transit,
_transit_effect_image_animation_op, effect,
_transit_effect_image_animation_context_free);
projects / framework / uifw / elementary.git / blobdiff