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 "Added GetNaturalSize to primitive visual." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
primitive
/
primitive-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
index
4bba653
..
fe14601
100644
(file)
--- a/
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
+++ b/
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
@@
-361,6
+361,12
@@
void PrimitiveVisual::SetSize( const Vector2& size )
// ToDo: renderer responds to the size change
}
// ToDo: renderer responds to the size change
}
+void PrimitiveVisual::GetNaturalSize( Vector2& naturalSize ) const
+{
+ naturalSize.x = mObjectDimensions.x;
+ naturalSize.y = mObjectDimensions.y;
+}
+
void PrimitiveVisual::SetClipRect( const Rect<int>& clipRect )
{
Visual::Base::SetClipRect( clipRect );
void PrimitiveVisual::SetClipRect( const Rect<int>& clipRect )
{
Visual::Base::SetClipRect( clipRect );