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 parameter (bool immediate) to TextChanged signal in interface" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-editor-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index
866c444
..
a8b9a0c
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-205,7
+205,7
@@
private: // From Control
/**
* @copydoc Text::EditableControlInterface::TextChanged()
*/
/**
* @copydoc Text::EditableControlInterface::TextChanged()
*/
- void TextChanged() override;
+ void TextChanged(
bool immediate
) override;
/**
* @copydoc Text::EditableControlInterface::MaxLengthReached()
/**
* @copydoc Text::EditableControlInterface::MaxLengthReached()
@@
-329,6
+329,11
@@
private: // Implementation
void OnIdleSignal();
/**
void OnIdleSignal();
/**
+ * @brief Emits TextChanged signal.
+ */
+ void EmitTextChangedSignal();
+
+ /**
* @brief set RenderActor's position with new scrollPosition
*
* Apply updated scroll position or start scroll animation if VerticalScrollAnimation is enabled
* @brief set RenderActor's position with new scrollPosition
*
* Apply updated scroll position or start scroll animation if VerticalScrollAnimation is enabled
@@
-362,7
+367,7
@@
private: // Implementation
* @param[in] actor The actor to be resized.
* @param[in] size Size to change.
*/
* @param[in] actor The actor to be resized.
* @param[in] size Size to change.
*/
- void ResizeActor(
Actor& actor, const Vector2& size
);
+ void ResizeActor(
Actor& actor, const Vector2& size
);
/**
* @brief Render view, create and attach actor(s) to this text editor.
/**
* @brief Render view, create and attach actor(s) to this text editor.
@@
-402,6
+407,7
@@
private: // Data
bool mScrollAnimationEnabled : 1;
bool mScrollBarEnabled : 1;
bool mScrollStarted : 1;
bool mScrollAnimationEnabled : 1;
bool mScrollBarEnabled : 1;
bool mScrollStarted : 1;
+ bool mTextChanged : 1; ///< If true, emits TextChangedSignal in next OnRelayout().
struct AccessibleImpl : public DevelControl::AccessibleImpl,
public virtual Dali::Accessibility::Text,
struct AccessibleImpl : public DevelControl::AccessibleImpl,
public virtual Dali::Accessibility::Text,