projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "(AnimatedVectorImage) Ensure the progress is kept according to actions" into...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
vector-rasterize-thread.cpp
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
index
da46e1e
..
25d0743
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
@@
-158,6
+158,9
@@
void VectorRasterizeThread::StopAnimation()
{
mPlayState = DevelImageVisual::PlayState::STOPPED;
{
mPlayState = DevelImageVisual::PlayState::STOPPED;
+ mCurrentFrame = mStartFrame;
+ mCurrentFrameUpdated = true;
+
DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::StopAnimation: Stop\n" );
}
}
DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::StopAnimation: Stop\n" );
}
}
@@
-332,8
+335,7
@@
void VectorRasterizeThread::Rasterize()
if( mPlayState == DevelImageVisual::PlayState::STOPPED )
{
if( mPlayState == DevelImageVisual::PlayState::STOPPED )
{
- // Reset the current frame and the current loop
- mCurrentFrame = mStartFrame;
+ // Reset the current loop
mCurrentLoop = 0;
}
mConditionalWait.Wait( lock );
mCurrentLoop = 0;
}
mConditionalWait.Wait( lock );