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;
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);
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))
{
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)
{
}
static void
+_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;
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);
+ _transit_chain_go(chain_transit);
+
}
eina_list_free(transit->next_chain_transits);
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 (!evas_object_data_get(obj, _transit_key))
{
_transit_obj_data_update(transit, obj);
- evas_object_pass_events_set(obj, EINA_TRUE);
+ evas_object_freeze_events_set(obj, EINA_TRUE);
}
}
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
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;
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);
+ WRN("A pair of transits does not have the chain relationship! : transit=%p, chain_transit=%p", transit, chain_transit);
return;
}
transit->next_chain_transits = eina_list_remove(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 Eina_List *
elm_transit_chain_transits_get(const Elm_Transit * transit)
{
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);
}