Revert "[Tizen](Vector) Stop the animation when the actor is off-stage or invisible"

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / animated-vector-image / animated-vector-image-visual.cpp

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
index 45c0af2..d4de346 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
@@ -118,8 +118,7 @@ AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factor
 
 AnimatedVectorImageVisual::~AnimatedVectorImageVisual()
 {
-  // Finalize animation task and disconnect the signal in the main thread
-  mVectorAnimationTask->UploadCompletedSignal().Disconnect( this, &AnimatedVectorImageVisual::OnUploadCompleted );
+  // Finalize animation task in the main thread
   mVectorAnimationTask->Finalize();
 }
 
@@ -308,7 +307,7 @@ void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor )
 
 void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor )
 {
-  StopAnimation();
+  PauseAnimation();
 
   if( mImpl->mRenderer )
   {
@@ -420,7 +419,7 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons
         if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
         {
           mVectorAnimationTask->RenderFrame();
-          Stage::GetCurrent().KeepRendering( 16.0f );    // Trigger rendering
+          Stage::GetCurrent().KeepRendering( 0.0f );    // Trigger rendering
         }
       }
       break;
@@ -514,7 +513,7 @@ void AnimatedVectorImageVisual::SendAnimationData()
       else
       {
         mVectorAnimationTask->RenderFrame();
-        Stage::GetCurrent().KeepRendering( 16.0f );
+        Stage::GetCurrent().KeepRendering( 0.0f );
       }
     }
 
@@ -532,17 +531,17 @@ void AnimatedVectorImageVisual::SetVectorImageSize()
   if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
   {
     mVectorAnimationTask->RenderFrame();
-    Stage::GetCurrent().KeepRendering( 16.0f );    // Trigger rendering
+    Stage::GetCurrent().KeepRendering( 0.0f );    // Trigger rendering
   }
 }
 
-void AnimatedVectorImageVisual::StopAnimation()
+void AnimatedVectorImageVisual::PauseAnimation()
 {
-  if( mActionStatus != DevelAnimatedVectorImageVisual::Action::STOP )
+  if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY )
   {
-    mVectorAnimationTask->StopAnimation();
+    mVectorAnimationTask->PauseAnimation();
 
-    mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP;
+    mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE;
 
     if( mImpl->mRenderer )
     {
@@ -585,7 +584,7 @@ void AnimatedVectorImageVisual::OnControlVisibilityChanged( Actor actor, bool vi
 {
   if( !visible )
   {
-    StopAnimation();
+    PauseAnimation();
 
     DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnControlVisibilityChanged: invisibile. Pause animation [%p]\n", this );
   }
@@ -595,7 +594,7 @@ void AnimatedVectorImageVisual::OnWindowVisibilityChanged( Window window, bool v
 {
   if( !visible )
   {
-    StopAnimation();
+    PauseAnimation();
 
     DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnWindowVisibilityChanged: invisibile. Pause animation [%p]\n", this );
   }