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 "Ensure UserDefined Font family is not changed by system font changing." into...
[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
2c8aa07
..
30e8b58
100644
(file)
--- a/
dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
+++ b/
dali-toolkit/devel-api/controls/renderer-factory/control-renderer.cpp
@@
-35,24
+35,25
@@
ControlRenderer::~ControlRenderer()
{
}
{
}
-ControlRenderer::ControlRenderer(
Internal::ControlRenderer *impl
)
-: BaseHandle(
impl
)
+ControlRenderer::ControlRenderer(
const ControlRenderer& handle
)
+: BaseHandle(
handle
)
{
}
{
}
-
void ControlRenderer::SetSize( const Vector2& siz
e )
+
ControlRenderer& ControlRenderer::operator=( const ControlRenderer& handl
e )
{
{
- GetImplementation( *this ).SetSize(size);
+ BaseHandle::operator=( handle );
+ return *this;
}
}
-void ControlRenderer::SetClipRect( const Rect<int>& clipRect )
+ControlRenderer::ControlRenderer(Internal::ControlRenderer *impl)
+: BaseHandle(impl)
{
{
- GetImplementation( *this ).SetClipRect(clipRect);
}
}
-void ControlRenderer::Set
Offset( const Vector2& offset
)
+void ControlRenderer::Set
Size( const Vector2& size
)
{
{
- GetImplementation( *this ).Set
Offset(offset
);
+ GetImplementation( *this ).Set
Size(size
);
}
void ControlRenderer::SetDepthIndex( float index )
}
void ControlRenderer::SetDepthIndex( float index )
@@
-70,6
+71,11
@@
void ControlRenderer::SetOffStage( Actor& actor )
GetImplementation( *this ).SetOffStage(actor);
}
GetImplementation( *this ).SetOffStage(actor);
}
+void ControlRenderer::CreatePropertyMap( Property::Map& map ) const
+{
+ GetImplementation( *this ).CreatePropertyMap( map );
+}
+
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali