From 58398f4786cfda817f17b371efdda4154f12de6b Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 24 Dec 2019 16:32:54 +0900 Subject: [PATCH] [Tizen](Vector) Stop the animation when the actor is off-stage or invisible Change-Id: I3919557bc961ed39300fc1885885cb52242680a4 --- .../animated-vector-image/animated-vector-image-visual.cpp | 14 +++++++------- .../animated-vector-image/animated-vector-image-visual.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) 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 f5d707f..45c0af2 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 @@ -308,7 +308,7 @@ void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor ) void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) { - PauseAnimation(); + StopAnimation(); if( mImpl->mRenderer ) { @@ -536,13 +536,13 @@ void AnimatedVectorImageVisual::SetVectorImageSize() } } -void AnimatedVectorImageVisual::PauseAnimation() +void AnimatedVectorImageVisual::StopAnimation() { - if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY ) + if( mActionStatus != DevelAnimatedVectorImageVisual::Action::STOP ) { - mVectorAnimationTask->PauseAnimation(); + mVectorAnimationTask->StopAnimation(); - mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE; + mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; if( mImpl->mRenderer ) { @@ -585,7 +585,7 @@ void AnimatedVectorImageVisual::OnControlVisibilityChanged( Actor actor, bool vi { if( !visible ) { - PauseAnimation(); + StopAnimation(); DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnControlVisibilityChanged: invisibile. Pause animation [%p]\n", this ); } @@ -595,7 +595,7 @@ void AnimatedVectorImageVisual::OnWindowVisibilityChanged( Window window, bool v { if( !visible ) { - PauseAnimation(); + StopAnimation(); 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 0ff2cdd..8aaed9c 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 Pause the animation. + * @brief Stop the animation. */ - void PauseAnimation(); + void StopAnimation(); /** * @brief Callback when the world scale factor changes. -- 2.7.4