projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f331aff
)
Revert "[Tizen] (Vector) Increase KeepRendering duration"
author
Wonsik Jung
<sidein@samsung.com>
Mon, 2 Dec 2019 05:42:32 +0000
(14:42 +0900)
committer
Wonsik Jung
<sidein@samsung.com>
Mon, 2 Dec 2019 05:42:32 +0000
(14:42 +0900)
This reverts commit
b3cdf204a75ee4bbd56d5a0fc23de475acf76e9d
.
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
patch
|
blob
|
history
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
patch
|
blob
|
history
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
3e8378b
..
122d407
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
@@
-437,7
+437,7
@@
void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons
if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
{
mVectorAnimationTask->RenderFrame();
if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
{
mVectorAnimationTask->RenderFrame();
- Stage::GetCurrent().KeepRendering(
1
.0f ); // Trigger rendering
+ Stage::GetCurrent().KeepRendering(
0
.0f ); // Trigger rendering
}
}
break;
}
}
break;
@@
-531,7
+531,7
@@
void AnimatedVectorImageVisual::SendAnimationData()
else
{
mVectorAnimationTask->RenderFrame();
else
{
mVectorAnimationTask->RenderFrame();
- Stage::GetCurrent().KeepRendering(
1
.0f );
+ Stage::GetCurrent().KeepRendering(
0
.0f );
}
}
}
}
@@
-549,7
+549,7
@@
void AnimatedVectorImageVisual::SetVectorImageSize()
if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
{
mVectorAnimationTask->RenderFrame();
if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
{
mVectorAnimationTask->RenderFrame();
- Stage::GetCurrent().KeepRendering(
1
.0f ); // Trigger rendering
+ Stage::GetCurrent().KeepRendering(
0
.0f ); // Trigger rendering
}
}
}
}
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
index
2579229
..
ac89867
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
@@
-94,8
+94,6
@@
VectorAnimationTask::~VectorAnimationTask()
void VectorAnimationTask::Finalize()
{
void VectorAnimationTask::Finalize()
{
- ConditionalWait::ScopedLock lock( mConditionalWait );
-
// Release some objects in the main thread
if( mAnimationFinishedTrigger )
{
// Release some objects in the main thread
if( mAnimationFinishedTrigger )
{