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 "WebView create a visual when it got a first frame" into devel/master
[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
d0609b6
..
424cda5
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-93,6
+93,11
@@
public:
DevelTextEditor::AnchorClickedSignalType& AnchorClickedSignal();
/**
DevelTextEditor::AnchorClickedSignalType& AnchorClickedSignal();
/**
+ * @copydoc Dali::Toollkit::TextEditor::InputFilteredSignal()
+ */
+ DevelTextEditor::InputFilteredSignalType& InputFilteredSignal();
+
+ /**
* Connects a callback function with the object's signals.
* @param[in] object The object providing the signal.
* @param[in] tracker Used to disconnect the signal.
* Connects a callback function with the object's signals.
* @param[in] object The object providing the signal.
* @param[in] tracker Used to disconnect the signal.
@@
-228,6
+233,11
@@
private: // From Control
*/
void AddDecoration(Actor& actor, bool needsClipping) override;
*/
void AddDecoration(Actor& actor, bool needsClipping) override;
+ /**
+ * @copydoc Text::EditableControlInterface::InputFiltered()
+ */
+ void InputFiltered(Toolkit::InputFilter::Property::Type type) override;
+
// From SelectableControlInterface
public:
/**
// From SelectableControlInterface
public:
/**
@@
-398,6
+408,7
@@
private: // Data
Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal;
Toolkit::DevelTextEditor::MaxLengthReachedSignalType mMaxLengthReachedSignal;
Toolkit::DevelTextEditor::AnchorClickedSignalType mAnchorClickedSignal;
Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal;
Toolkit::DevelTextEditor::MaxLengthReachedSignalType mMaxLengthReachedSignal;
Toolkit::DevelTextEditor::AnchorClickedSignalType mAnchorClickedSignal;
+ Toolkit::DevelTextEditor::InputFilteredSignalType mInputFilteredSignal;
InputMethodContext mInputMethodContext;
Text::ControllerPtr mController;
InputMethodContext mInputMethodContext;
Text::ControllerPtr mController;
@@
-409,9
+420,11
@@
private: // Data
Dali::Animation mAnimation; ///< Scroll indicator Show/Hide Animation.
Dali::TimePeriod mAnimationPeriod;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Dali::Animation mAnimation; ///< Scroll indicator Show/Hide Animation.
Dali::TimePeriod mAnimationPeriod;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
+ Dali::InputMethodOptions mInputMethodOptions;
Actor mRenderableActor;
Actor mActiveLayer;
Actor mRenderableActor;
Actor mActiveLayer;
+ Actor mBackgroundActor;
CallbackBase* mIdleCallback;
float mAlignmentOffset;
CallbackBase* mIdleCallback;
float mAlignmentOffset;
@@
-442,6
+455,9
@@
private: // Data
bool CopyText(size_t startPosition, size_t endPosition) override;
bool CutText(size_t startPosition, size_t endPosition) override;
Accessibility::States CalculateStates() override;
bool CopyText(size_t startPosition, size_t endPosition) override;
bool CutText(size_t startPosition, size_t endPosition) override;
Accessibility::States CalculateStates() override;
+ bool InsertText(size_t startPosition, std::string text) override;
+ bool SetTextContents(std::string newContents) override;
+ bool DeleteText(size_t startPosition, size_t endPosition) override;
};
};
};
};