From fb7a84118ac4d5ddeb41f9d2d741f6aa51045ee8 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Mon, 15 Sep 2014 14:52:44 +0100 Subject: [PATCH] Remove deprecated SetRemoveTime API [problem] Deprecated API is still being used [cause] ItemView legacy code [solution] Remove code Change-Id: Ia1741882e1e42d5ca957370d9721f473104ce621 --- .../public-api/controls/scrollable/item-view/item-layout.cpp | 5 ----- 1 file changed, 5 deletions(-) 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 da7863c..32aeb7a 100644 --- 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 @@ -392,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); @@ -415,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); -- 2.7.4