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 changes I000b9684,I1a6a0f46 into devel/master
[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
c036334
..
36e5c02
100644
(file)
--- a/
dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
+++ b/
dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
@@
-47,13
+47,13
@@
ControlRenderer& ControlRenderer::operator=( const ControlRenderer& handle )
}
ControlRenderer::ControlRenderer(Internal::ControlRenderer *impl)
}
ControlRenderer::ControlRenderer(Internal::ControlRenderer *impl)
-: BaseHandle(
impl
)
+: BaseHandle(
impl
)
{
}
void ControlRenderer::SetSize( const Vector2& size )
{
{
}
void ControlRenderer::SetSize( const Vector2& size )
{
- GetImplementation( *this ).SetSize(
size
);
+ GetImplementation( *this ).SetSize(
size
);
}
const Vector2& ControlRenderer::GetSize() const
}
const Vector2& ControlRenderer::GetSize() const
@@
-68,7
+68,7
@@
void ControlRenderer::GetNaturalSize(Vector2& naturalSize ) const
void ControlRenderer::SetDepthIndex( float index )
{
void ControlRenderer::SetDepthIndex( float index )
{
- GetImplementation( *this ).SetDepthIndex(
index
);
+ GetImplementation( *this ).SetDepthIndex(
index
);
}
float ControlRenderer::GetDepthIndex() const
}
float ControlRenderer::GetDepthIndex() const
@@
-78,12
+78,12
@@
float ControlRenderer::GetDepthIndex() const
void ControlRenderer::SetOnStage( Actor& actor )
{
void ControlRenderer::SetOnStage( Actor& actor )
{
- GetImplementation( *this ).SetOnStage(
actor
);
+ GetImplementation( *this ).SetOnStage(
actor
);
}
void ControlRenderer::SetOffStage( Actor& actor )
{
}
void ControlRenderer::SetOffStage( Actor& actor )
{
- GetImplementation( *this ).SetOffStage(
actor
);
+ GetImplementation( *this ).SetOffStage(
actor
);
}
void ControlRenderer::RemoveAndReset( Actor& actor )
}
void ControlRenderer::RemoveAndReset( Actor& actor )