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 "(Automated Tests) Sync with core tests" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.cpp
b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index
1b9cec7
..
9cd41e0
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.cpp
@@
-109,7
+109,7
@@
float Visual::Base::GetHeightForWidth( float width ) const
return 0.f;
}
return 0.f;
}
-void Visual::Base::GetNaturalSize( Vector2& naturalSize )
const
+void Visual::Base::GetNaturalSize( Vector2& naturalSize )
{
naturalSize = Vector2::ZERO;
}
{
naturalSize = Vector2::ZERO;
}
@@
-190,8
+190,8
@@
bool Visual::Base::IsPreMultipliedAlphaEnabled() const
void Visual::Base::DoSetOffStage( Actor& actor )
{
void Visual::Base::DoSetOffStage( Actor& actor )
{
-
actor.RemoveRenderer( mImpl->mRenderer );
-
mImpl->mRenderer.Reset();
+ actor.RemoveRenderer( mImpl->mRenderer );
+ mImpl->mRenderer.Reset();
}
bool Visual::Base::IsOnStage() const
}
bool Visual::Base::IsOnStage() const