Remove deprecated SetRemoveTime API

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / controls / scrollable / item-view / item-layout.cpp

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
index 4bd1ac3..32aeb7a 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
@@ -20,7 +20,6 @@
 
 namespace
 {
-  const float DEFAULT_COLOR_VISIBILITY_REMOVE_TIME = 0.5f; // 0.5 second
 
   // Functors which wrap constraint functions with stored item IDs
   struct WrappedQuaternionConstraint
@@ -330,12 +329,6 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
   Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast( itemViewActor );
   if(itemView && scrollPositionObject)
   {
-    ///!ToDo: Remove this once AlphaFunction in itemview is removed
-    if( itemView.GetDefaultAlphaFunction() != Constraint::DEFAULT_ALPHA_FUNCTION )
-    {
-      mAlphaFunction = itemView.GetDefaultAlphaFunction();
-    }
-
     Property::Index scrollSpeedProperty = itemView.GetPropertyIndex("item-view-scroll-speed");
     Property::Index scrollPositionProperty = scrollPositionObject.GetPropertyIndex("scroll-position");
 
@@ -398,9 +391,6 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
 
       constraint.SetApplyTime(durationSeconds);
       constraint.SetAlphaFunction(mAlphaFunction);
-
-      // Release color constraints slowly; this allows ItemView to co-exist with ImageActor fade-in
-      constraint.SetRemoveTime(DEFAULT_COLOR_VISIBILITY_REMOVE_TIME);
       constraint.SetRemoveAction(Dali::Constraint::Discard);
 
       actor.ApplyConstraint(constraint);
@@ -421,7 +411,6 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
       constraint.SetAlphaFunction(mAlphaFunction);
 
       // Release visibility constraints the same time as the color constraint
-      constraint.SetRemoveTime(DEFAULT_COLOR_VISIBILITY_REMOVE_TIME);
       constraint.SetRemoveAction(Dali::Constraint::Discard);
 
       actor.ApplyConstraint(constraint);