X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-vertical-scroller.cpp;h=03d87a6ebbfaae9a88f61b290800fce540249e68;hb=d19410c023c18c050ae226c72c6d79ebf9b0de80;hp=b9d6606c3c615790a4fb70f1a30e72f21f47c305;hpb=422c40083dab9c4ea4e2a3502a9ebf58db8dff52;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/text-vertical-scroller.cpp b/dali-toolkit/internal/text/text-vertical-scroller.cpp
index b9d6606..03d87a6 100644
--- a/dali-toolkit/internal/text/text-vertical-scroller.cpp
+++ b/dali-toolkit/internal/text/text-vertical-scroller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -24,29 +24,25 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace
 {
-
-const float DEFAULT_VERTICAL_SCROLL_DURATION(0.15f);     ///< Duration to complete scroll animation
+const float DEFAULT_VERTICAL_SCROLL_DURATION(0.15f); ///< Duration to complete scroll animation
 
 } // namespace
 
 namespace Text
 {
-
 TextVerticalScrollerPtr TextVerticalScroller::New()
 {
-  TextVerticalScrollerPtr textScroller( new TextVerticalScroller() );
+  TextVerticalScrollerPtr textScroller(new TextVerticalScroller());
   return textScroller;
 }
 
 TextVerticalScroller::TextVerticalScroller()
-: mDuration( DEFAULT_VERTICAL_SCROLL_DURATION ),
-  mScrollTo( 0.0f )
+: mDuration(DEFAULT_VERTICAL_SCROLL_DURATION),
+  mScrollTo(0.0f)
 {
 }
 
@@ -54,39 +50,39 @@ TextVerticalScroller::~TextVerticalScroller()
 {
 }
 
-void TextVerticalScroller::CheckStartAnimation( Actor& sourceActor, float x, float y, float scrollAmount )
+void TextVerticalScroller::CheckStartAnimation(Actor& sourceActor, float x, float y, float scrollAmount)
 {
-  if ( Equals( scrollAmount, 0.0f, Math::MACHINE_EPSILON_1 ) )
+  if(Equals(scrollAmount, 0.0f, Math::MACHINE_EPSILON_1))
   {
     // scroll animation isn't required, set position only
-    if( mScrollAnimation && mScrollAnimation.GetState() == Animation::PLAYING )
+    if(mScrollAnimation && mScrollAnimation.GetState() == Animation::PLAYING)
     {
       mScrollAnimation.Clear();
     }
-    sourceActor.SetPosition( x, y );
+    sourceActor.SetProperty(Actor::Property::POSITION, Vector2(x, y));
     return;
   }
   float toY = y + scrollAmount;
   // Either actor or scroll area is changed, so restart animation
-  if( mScrollAnimation )
+  if(mScrollAnimation)
   {
     mScrollAnimation.Clear();
   }
   else
   {
     // Create animation at first
-    mScrollAnimation = Animation::New( mDuration );
+    mScrollAnimation = Animation::New(mDuration);
   }
   mScrollingActor = sourceActor;
-  mScrollTo = toY;
+  mScrollTo       = toY;
 
   // Set animation attribute
-  sourceActor.SetPosition( x, y );
-  mScrollAnimation.AnimateTo( Property(sourceActor, Actor::Property::POSITION_Y), mScrollTo, AlphaFunction::EASE_OUT_SINE );
+  sourceActor.SetProperty(Actor::Property::POSITION, Vector2(x, y));
+  mScrollAnimation.AnimateTo(Property(sourceActor, Actor::Property::POSITION_Y), mScrollTo, AlphaFunction::EASE_OUT_SINE);
   mScrollAnimation.Play();
 }
 
-void TextVerticalScroller::SetDuration( float duration )
+void TextVerticalScroller::SetDuration(float duration)
 {
   mDuration = duration;
 }