3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

[framework/uifw/elementary.git] / src / lib / elm_transit.c

diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 7f3d3bb..3116daa 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -78,7 +78,7 @@ struct _Elm_Transit_Obj_State
 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;
@@ -92,8 +92,9 @@ static void _transit_obj_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object *
 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 void _transit_animate_op(Elm_Transit *transit, double progress);
+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";
@@ -106,7 +107,7 @@ _transit_obj_data_update(Elm_Transit *transit, Evas_Object *obj)
    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))
      {
@@ -179,7 +180,7 @@ _transit_obj_data_recover(Elm_Transit *transit, Evas_Object *obj)
    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)
      {
@@ -235,6 +236,14 @@ _transit_remove_dead_effects(Elm_Transit *transit)
 }
 
 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;
@@ -244,7 +253,7 @@ _transit_del(Elm_Transit *transit)
    if (transit->animator)
      ecore_animator_del(transit->animator);
 
-   //remove effects 
+   //remove effects
    while (transit->effect_list)
      {
         effect_module = EINA_INLIST_CONTAINER_GET(transit->effect_list, Elm_Transit_Effect_Module);
@@ -252,7 +261,7 @@ _transit_del(Elm_Transit *transit)
         _transit_effect_del(transit, effect_module);
      }
 
-   //remove objects. 
+   //remove objects.
    while (transit->objs)
      _transit_obj_remove(transit, eina_list_data_get(transit->objs));
 
@@ -273,7 +282,8 @@ _transit_del(Elm_Transit *transit)
    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);
@@ -282,7 +292,8 @@ _transit_del(Elm_Transit *transit)
    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;
@@ -296,10 +307,17 @@ _transit_animate_op(Elm_Transit *transit, double progress)
      }
    transit->walking--;
 
-   if (transit->walking) return;
+   if (transit->walking) return EINA_TRUE;
+
+   if (transit->deleted)
+     {
+        _transit_del(transit);
+        return EINA_FALSE;
+     }
 
-   if (transit->deleted) _transit_del(transit);
    else if (transit->effects_pending_del) _transit_remove_dead_effects(transit);
+
+   return EINA_TRUE;
 }
 
 static Eina_Bool
@@ -318,23 +336,37 @@ _transit_animate_cb(void *data)
    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;
@@ -453,7 +485,7 @@ elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj)
         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);
           }
      }
 
@@ -494,7 +526,7 @@ elm_transit_event_enabled_set(Elm_Transit *transit, Eina_Bool enabled)
    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
@@ -591,7 +623,7 @@ elm_transit_go(Elm_Transit *transit)
    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;
@@ -2200,7 +2232,7 @@ _transit_effect_image_animation_op(Elm_Transit_Effect *effect, Elm_Transit *tran
 
    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);
      }