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
Debug renderer
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
control-renderer-impl.cpp
diff --git
a/dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp
b/dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp
index
04792c5
..
7ac2490
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp
+++ b/
dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp
@@
-130,8
+130,6
@@
void ControlRenderer::SetOffStage( Actor& actor )
if( GetIsOnStage() )
{
DoSetOffStage( actor );
if( GetIsOnStage() )
{
DoSetOffStage( actor );
- actor.RemoveRenderer( mImpl->mRenderer );
- mImpl->mRenderer.Reset();
mImpl->mFlags &= ~Impl::IS_ON_STAGE;
}
mImpl->mFlags &= ~Impl::IS_ON_STAGE;
}
@@
-143,15
+141,18
@@
void ControlRenderer::DoSetOnStage( Actor& actor )
void ControlRenderer::DoSetOffStage( Actor& actor )
{
void ControlRenderer::DoSetOffStage( Actor& actor )
{
+ actor.RemoveRenderer( mImpl->mRenderer );
+ mImpl->mRenderer.Reset();
}
void ControlRenderer::CreatePropertyMap( Property::Map& map ) const
{
}
void ControlRenderer::CreatePropertyMap( Property::Map& map ) const
{
+ DoCreatePropertyMap( map );
+
if( mImpl->mCustomShader )
{
mImpl->mCustomShader->CreatePropertyMap( map );
}
if( mImpl->mCustomShader )
{
mImpl->mCustomShader->CreatePropertyMap( map );
}
- DoCreatePropertyMap( map );
}
bool ControlRenderer::GetIsOnStage() const
}
bool ControlRenderer::GetIsOnStage() const