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
Updated Model3dView control to use SetTexture
[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
91d757b
..
c574bb8
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-216,9
+216,9
@@
private: // Implementation
* @brief Callback when TextField is touched
*
* @param[in] actor TextField touched
* @brief Callback when TextField is touched
*
* @param[in] actor TextField touched
- * @param[in]
event TouchEvent
information
+ * @param[in]
touch Touch
information
*/
*/
- bool OnTouched( Actor actor, const Touch
Event& event
);
+ bool OnTouched( Actor actor, const Touch
Data& touch
);
/**
* Construct a new TextField.
/**
* Construct a new TextField.
@@
-237,7
+237,7
@@
private: // Implementation
/**
* @brief Render view, create and attach actor(s) to this Text Field.
*/
/**
* @brief Render view, create and attach actor(s) to this Text Field.
*/
- void RenderText();
+ void RenderText(
Text::Controller::UpdateTextType updateTextType
);
// Connection needed to re-render text, when a Text Field returns to the stage.
void OnStageConnect( Dali::Actor actor );
// Connection needed to re-render text, when a Text Field returns to the stage.
void OnStageConnect( Dali::Actor actor );