X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-layout.cpp;h=7d6d17fa9bcfa3c3fd0ea4914daebf740e28f127;hb=df92f45e89c92ca9b2286d51116ff7b69e75c569;hp=918b9bb47325a1e17d6c70074704ed90c8981e38;hpb=d04c5bdbb95cc98f90848c7a98b0b2804df6e5b8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp index 918b9bb..7d6d17f 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -130,7 +130,7 @@ namespace Toolkit ItemLayout::ItemLayout() : mOrientation( ControlOrientation::Up ), - mAlphaFunction( AlphaFunctions::Linear ), + mAlphaFunction( AlphaFunction::LINEAR ), mWeightObject() { } @@ -291,7 +291,7 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d keyFrames.Add( 1.0f, 1.0f ); Animation applyAnimation = Dali::Animation::New( durationSeconds ); - applyAnimation.AnimateBetween( Property( mWeightObject, WeightObject::WEIGHT ), keyFrames, mAlphaFunction, durationSeconds ); + applyAnimation.AnimateBetween( Property( mWeightObject, WeightObject::WEIGHT ), keyFrames, mAlphaFunction, TimePeriod(durationSeconds) ); applyAnimation.Play(); } }