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 "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metri...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-field-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index
fa55c77
..
5428275
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-96,7
+96,7
@@
private: // From Control
/**
* @copydoc Control::OnInitialize()
*/
/**
* @copydoc Control::OnInitialize()
*/
- virtual void OnRelayout( const Vector2& size,
ActorSize
Container& container );
+ virtual void OnRelayout( const Vector2& size,
Relayout
Container& container );
/**
* @copydoc Control::OnKeyInputFocusGained()
/**
* @copydoc Control::OnKeyInputFocusGained()
@@
-109,11
+109,16
@@
private: // From Control
virtual void OnKeyInputFocusLost();
/**
virtual void OnKeyInputFocusLost();
/**
- *
Received for single & double taps
+ *
@copydoc Control::OnTap()
*/
virtual void OnTap( const TapGesture& tap );
/**
*/
virtual void OnTap( const TapGesture& tap );
/**
+ * @copydoc Control::OnPan()
+ */
+ virtual void OnPan( const PanGesture& gesture );
+
+ /**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
virtual bool OnKeyEvent(const KeyEvent& event);
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
virtual bool OnKeyEvent(const KeyEvent& event);