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 b706a37..3116daa 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -92,10 +92,7 @@ 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);
-<<<<<<< HEAD
-=======
 static void _transit_chain_go(Elm_Transit *transit);
->>>>>>> remotes/origin/upstream
 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);
@@ -239,8 +236,6 @@ _transit_remove_dead_effects(Elm_Transit *transit)
 }
 
 static void
-<<<<<<< HEAD
-=======
 _transit_chain_go(Elm_Transit *transit)
 {
    ELM_TRANSIT_CHECK_OR_RETURN(transit);
@@ -249,7 +244,6 @@ _transit_chain_go(Elm_Transit *transit)
 }
 
 static void
->>>>>>> remotes/origin/upstream
 _transit_del(Elm_Transit *transit)
 {
    Elm_Transit_Effect_Module *effect_module;
@@ -288,12 +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)
-<<<<<<< HEAD
-          elm_transit_go(chain_transit);
-=======
           _transit_chain_go(chain_transit);
 
->>>>>>> remotes/origin/upstream
      }
 
    eina_list_free(transit->next_chain_transits);
@@ -346,16 +336,6 @@ _transit_animate_cb(void *data)
    transit->progress = elapsed_time / duration;
    switch (transit->tween_mode)
      {
-<<<<<<< HEAD
-      case ELM_TRANSIT_TWEEN_MODE_ACCELERATE:
-         transit->progress = 1.0 - sin((ELM_PI / 2.0) + (transit->progress * ELM_PI / 2.0));
-         break;
-      case ELM_TRANSIT_TWEEN_MODE_DECELERATE:
-         transit->progress = sin(transit->progress * ELM_PI / 2.0);
-         break;
-      case ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL:
-         transit->progress = (1.0 - cos(transit->progress * ELM_PI)) / 2.0;
-=======
       case ELM_TRANSIT_TWEEN_MODE_LINEAR:
          transit->progress = ecore_animator_pos_map(transit->progress,
                                                     ECORE_POS_MAP_LINEAR,
@@ -374,7 +354,6 @@ _transit_animate_cb(void *data)
          transit->progress = ecore_animator_pos_map(transit->progress,
                                                     ECORE_POS_MAP_SINUSOIDAL,
                                                     0, 0);
->>>>>>> remotes/origin/upstream
          break;
       default:
          break;