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 "TextField to consume TouchEvents" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index
c72c9c5
..
3e0fd35
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-73,9
+73,14
@@
private: // From Control
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc Control::OnInitialize()
+ * @copydoc Control::OnStyleChange()
+ */
+ virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
+
+ /**
+ * @copydoc Control::OnRelayout()
*/
*/
- virtual void OnRelayout( const Vector2& size,
ActorSize
Container& container );
+ virtual void OnRelayout( const Vector2& size,
Relayout
Container& container );
/**
* @copydoc Control::GetNaturalSize()
/**
* @copydoc Control::GetNaturalSize()
@@
-92,6
+97,11
@@
private: // From Control
*/
virtual void RequestTextRelayout();
*/
virtual void RequestTextRelayout();
+ /**
+ * @copydoc Text::ControlInterface::MaxLengthReached()
+ */
+ virtual void MaxLengthReached();
+
private: // Implementation
/**
private: // Implementation
/**