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 some LayoutEngine skeleton code
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.h
diff --git
a/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
b/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index
b3ecd0e
..
3ea01f2
100644
(file)
--- a/
base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-81,6
+81,11
@@
private: // From Control
*/
virtual void OnInitialize();
*/
virtual void OnInitialize();
+ /**
+ * @copydoc Control::OnInitialize()
+ */
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+
private: // Implementation
/**
private: // Implementation
/**
@@
-90,6
+95,12
@@
private: // Implementation
void SetText( const std::string& text );
/**
void SetText( const std::string& text );
/**
+ * Helper for SetProperty.
+ * @param[in] multiLine The new "multi-line" property value.
+ */
+ void SetMultiLine( bool multiLine );
+
+ /**
* Construct a new TextLabel.
*/
TextLabel();
* Construct a new TextLabel.
*/
TextLabel();