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 "Add text selection popup style" into devel/master
[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
d2d7fdf
..
6c4faa6
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-212,6
+212,11
@@
private: // From Control
void OnSceneConnection(int depth) override;
/**
void OnSceneConnection(int depth) override;
/**
+ * @copydoc Control::OnPropertySet()
+ */
+ void OnPropertySet(Property::Index index, const Property::Value& propertyValue) override;
+
+ /**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
bool OnKeyEvent(const KeyEvent& event) override;
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
bool OnKeyEvent(const KeyEvent& event) override;