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
Render control background without creating extra actor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
renderer-factory
/
control-renderer.cpp
diff --git
a/dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
b/dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
index
30e8b58
..
c036334
100644
(file)
--- a/
dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
+++ b/
dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
@@
-56,11
+56,26
@@
void ControlRenderer::SetSize( const Vector2& size )
GetImplementation( *this ).SetSize(size);
}
GetImplementation( *this ).SetSize(size);
}
+const Vector2& ControlRenderer::GetSize() const
+{
+ return GetImplementation( *this ).GetSize();
+}
+
+void ControlRenderer::GetNaturalSize(Vector2& naturalSize ) const
+{
+ GetImplementation( *this ).GetNaturalSize( naturalSize );
+}
+
void ControlRenderer::SetDepthIndex( float index )
{
GetImplementation( *this ).SetDepthIndex(index);
}
void ControlRenderer::SetDepthIndex( float index )
{
GetImplementation( *this ).SetDepthIndex(index);
}
+float ControlRenderer::GetDepthIndex() const
+{
+ return GetImplementation( *this ).GetDepthIndex();
+}
+
void ControlRenderer::SetOnStage( Actor& actor )
{
GetImplementation( *this ).SetOnStage(actor);
void ControlRenderer::SetOnStage( Actor& actor )
{
GetImplementation( *this ).SetOnStage(actor);
@@
-71,6
+86,15
@@
void ControlRenderer::SetOffStage( Actor& actor )
GetImplementation( *this ).SetOffStage(actor);
}
GetImplementation( *this ).SetOffStage(actor);
}
+void ControlRenderer::RemoveAndReset( Actor& actor )
+{
+ if( actor && *this )
+ {
+ SetOffStage( actor );
+ }
+ Reset();
+}
+
void ControlRenderer::CreatePropertyMap( Property::Map& map ) const
{
GetImplementation( *this ).CreatePropertyMap( map );
void ControlRenderer::CreatePropertyMap( Property::Map& map ) const
{
GetImplementation( *this ).CreatePropertyMap( map );