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
6be336b
..
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
@@
-25,6
+25,7
@@
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
#include <dali-toolkit/internal/controls/control/control-data-impl.h>
#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
#include <dali-toolkit/internal/controls/control/control-data-impl.h>
@@
-204,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()
@@
-328,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
@@
-356,6
+362,14
@@
private: // Implementation
TextEditor& operator=(const TextEditor& rhs);
/**
TextEditor& operator=(const TextEditor& rhs);
/**
+ * @brief Resize actor to the given size.
+ *
+ * @param[in] actor The actor to be resized.
+ * @param[in] size Size to change.
+ */
+ void ResizeActor(Actor& actor, const Vector2& size);
+
+ /**
* @brief Render view, create and attach actor(s) to this text editor.
*/
void RenderText(Text::Controller::UpdateTextType updateTextType);
* @brief Render view, create and attach actor(s) to this text editor.
*/
void RenderText(Text::Controller::UpdateTextType updateTextType);
@@
-393,12
+407,13
@@
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
Control::Imp
l::AccessibleImpl,
+ struct AccessibleImpl : public
DevelContro
l::AccessibleImpl,
public virtual Dali::Accessibility::Text,
public virtual Dali::Accessibility::EditableText
{
public virtual Dali::Accessibility::Text,
public virtual Dali::Accessibility::EditableText
{
- using
Control::Imp
l::AccessibleImpl::AccessibleImpl;
+ using
DevelContro
l::AccessibleImpl::AccessibleImpl;
std::string GetName() override;
std::string GetText(size_t startOffset, size_t endOffset) override;
std::string GetName() override;
std::string GetText(size_t startOffset, size_t endOffset) override;