[Tizen] Fix auto scroll timing issue

Prevents ScrollingFinished calls due to animation finished callback in immediate stop mode.

Change-Id: Ibc40ca15e1ba2a0fbaa237a31db231201e9027e0
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index 08e08c82d80ac90e43e69c33f098775140c7a3a7..bd8673995038ba761aedc50330e3e36d989f2b85 100644 (file)
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -150,8 +150,9 @@ void TextScroller::StopScrolling()
     {
       case TextLabel::AutoScrollStopMode::IMMEDIATE:
       {
-        mIsStop = true;
+        mIsStop = false;
         mScrollAnimation.Stop();
+        mScrollerInterface.ScrollingFinished();
         break;
       }
       case TextLabel::AutoScrollStopMode::FINISH_LOOP:
@@ -281,13 +282,9 @@ void TextScroller::AutoScrollAnimationFinished(Dali::Animation& animation)
 {
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextScroller::AutoScrollAnimationFinished\n");
   mIsStop = false;
-  mScrollerInterface.ScrollingFinished();
-
-  // Revert to the original shader and texture after scrolling
-  mRenderer.SetShader(mShader);
-  if(mTextureSet)
+  if(mStopMode == TextLabel::AutoScrollStopMode::FINISH_LOOP)
   {
-    mRenderer.SetTextures(mTextureSet);
+    mScrollerInterface.ScrollingFinished();
   }
 }