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
Added interface for queuing input events in TextController
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index
93c5500
..
073b02b
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@
-127,7
+127,7
@@
Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde
void TextLabel::OnInitialize()
{
void TextLabel::OnInitialize()
{
- mController = Text::Controller::New();
+ mController = Text::Controller::New(
*this
);
}
Vector3 TextLabel::GetNaturalSize()
}
Vector3 TextLabel::GetNaturalSize()
@@
-186,6
+186,11
@@
void TextLabel::SetMultiLine( bool multiLine )
}
}
}
}
+void TextLabel::RequestTextRelayout()
+{
+ RelayoutRequest();
+}
+
TextLabel::TextLabel()
: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) )
{
TextLabel::TextLabel()
: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) )
{