From: Joogab Yun Date: Fri, 27 Dec 2019 08:41:27 +0000 (+0900) Subject: Revert "[Tizen](Vector) Stop the animation when the actor is off-stage or invisible" X-Git-Tag: accepted/tizen/5.5/unified/20200102.013929~12 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c3253649f11657a53f9aafdc781c6456b56bcd67 Revert "[Tizen](Vector) Stop the animation when the actor is off-stage or invisible" This reverts commit 58398f4786cfda817f17b371efdda4154f12de6b. --- 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 2ed0502..d4de346 100644 --- 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 @@ -307,7 +307,7 @@ void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor ) void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) { - StopAnimation(); + PauseAnimation(); if( mImpl->mRenderer ) { @@ -535,13 +535,13 @@ void AnimatedVectorImageVisual::SetVectorImageSize() } } -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 ) { @@ -584,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 ); } @@ -594,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 ); } diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h index 8aaed9c..0ff2cdd 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h @@ -168,9 +168,9 @@ private: void SetVectorImageSize(); /** - * @brief Stop the animation. + * @brief Pause the animation. */ - void StopAnimation(); + void PauseAnimation(); /** * @brief Callback when the world scale factor changes.