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
New size negotiation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-view
/
text-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
b/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
index
3619590
..
4278d4b
100644
(file)
--- a/
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
@@
-1199,6
+1199,8
@@
float TextView::GetWidthForHeight( float height )
void TextView::OnInitialize()
{
void TextView::OnInitialize()
{
+ // The actor handle needs to be inialised for this to work
+ Self().SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
}
}
@@
-1222,7
+1224,7
@@
void TextView::OnControlSizeSet( const Vector3& size )
}
}
}
}
-void TextView::OnRelayout( const Vector2& size,
ActorSize
Container& container )
+void TextView::OnRelayout( const Vector2& size,
Relayout
Container& container )
{
if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
{
{
if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
{