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.h
diff --git
a/dali-toolkit/internal/controls/text-view/text-view-impl.h
b/dali-toolkit/internal/controls/text-view/text-view-impl.h
index
dfa7760
..
270d32b
100644
(file)
--- a/
dali-toolkit/internal/controls/text-view/text-view-impl.h
+++ b/
dali-toolkit/internal/controls/text-view/text-view-impl.h
@@
-377,7
+377,7
@@
private: // From Control
/**
* @copydoc Toolkit::Control::OnRelayout()
*/
/**
* @copydoc Toolkit::Control::OnRelayout()
*/
- virtual void OnRelayout( const Vector2& size,
ActorSize
Container& container );
+ virtual void OnRelayout( const Vector2& size,
Relayout
Container& container );
/**
* Retrieves the text-view's natural size.
/**
* Retrieves the text-view's natural size.