X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.h;h=7e18a821699663872c42e16826c1e3ac8e6b4e1f;hp=85d50ef2d3140f50e235a24fc53c94504973f780;hb=refs%2Fchanges%2F52%2F267152%2F1;hpb=fa3f750c6878eb126034d7958458dc3a1f67924f 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 85d50ef..7e18a82 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -117,10 +117,25 @@ public: DevelTextField::AnchorClickedSignalType& AnchorClickedSignal(); /** + * @copydoc TextField::CursorPositionChangedSignal() + */ + DevelTextField::CursorPositionChangedSignalType& CursorPositionChangedSignal(); + + /** * @copydoc TextField::InputFilteredSignal() */ DevelTextField::InputFilteredSignalType& InputFilteredSignal(); + /** + * @copydoc TextField::SelectionChangedSignal() + */ + DevelTextField::SelectionChangedSignalType& SelectionChangedSignal(); + + /** + * @copydoc TextField::SelectionClearedSignal() + */ + DevelTextField::SelectionClearedSignalType& SelectionClearedSignal(); + private: // From Control /** * @copydoc Control::OnInitialize() @@ -207,9 +222,9 @@ private: // From Control void TextDeleted(unsigned int position, unsigned int length, const std::string& content) override; /** - * @copydoc Text::EditableControlInterface::CursorMoved() + * @copydoc Text::EditableControlInterface::CursorPositionChanged() */ - void CursorMoved(unsigned int position) override; + void CursorPositionChanged(unsigned int oldPosition, unsigned int newPosition) override; /** * @copydoc Text::EditableControlInterface::TextChanged() @@ -227,6 +242,11 @@ private: // From Control void InputStyleChanged(Text::InputStyle::Mask inputStyleMask) override; /** + * @copydoc Text::SelectableControlInterface::SelectionChanged() + */ + void SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t newStart, uint32_t newEnd) override; + + /** * @copydoc Text::EditableControlInterface::AddDecoration() */ void AddDecoration(Actor& actor, bool needsClipping) override; @@ -264,6 +284,11 @@ public: void SelectNone() override; /** + * @copydoc Text::SelectableControlInterface::SelectText() + */ + void SelectText(const uint32_t start, const uint32_t end) override; + + /** * @copydoc Text::SelectableControlInterface::GetSelectedText() */ string GetSelectedText() const override; @@ -278,6 +303,21 @@ public: */ void SetEditable(bool editable) override; + /** + * @copydoc Dali::EditableControlInterface::CopyText() + */ + string CopyText() override; + + /** + * @copydoc Dali::EditableControlInterface::CutText() + */ + string CutText() override; + + /** + * @copydoc Text::EditableControlInterface::PasteText() + */ + void PasteText() override; + // From AnchorControlInterface /** @@ -338,6 +378,21 @@ private: // Implementation void EmitTextChangedSignal(); /** + * @brief Emits CursorPositionChanged signal. + */ + void EmitCursorPositionChangedSignal(); + + /** + * @brief Emits SelectionChanged signal. + */ + void EmitSelectionChangedSignal(); + + /** + * @brief Emits SelectionCleared signal. + */ + void EmitSelectionClearedSignal(); + + /** * @brief Callback function for when the layout is changed. * @param[in] actor The actor whose layoutDirection is changed. * @param[in] type The layoutDirection. @@ -374,21 +429,28 @@ private: // Implementation // Connection needed to re-render text, when a Text Field returns to the scene. void OnSceneConnect(Dali::Actor actor); + // Needed to synchronize TextAnchor actors with Anchor objects in text's logical model + void OnAccessibilityStatusChanged(); + private: // Data // Signals - Toolkit::TextField::TextChangedSignalType mTextChangedSignal; - Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; - Toolkit::TextField::InputStyleChangedSignalType mInputStyleChangedSignal; - Toolkit::DevelTextField::AnchorClickedSignalType mAnchorClickedSignal; - Toolkit::DevelTextField::InputFilteredSignalType mInputFilteredSignal; - - InputMethodContext mInputMethodContext; - Text::ControllerPtr mController; - Text::RendererPtr mRenderer; - Text::DecoratorPtr mDecorator; - Toolkit::Control mStencil; ///< For EXCEED_POLICY_CLIP - std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. - Dali::InputMethodOptions mInputMethodOptions; + Toolkit::TextField::TextChangedSignalType mTextChangedSignal; + Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; + Toolkit::TextField::InputStyleChangedSignalType mInputStyleChangedSignal; + Toolkit::DevelTextField::AnchorClickedSignalType mAnchorClickedSignal; + Toolkit::DevelTextField::InputFilteredSignalType mInputFilteredSignal; + Toolkit::DevelTextField::CursorPositionChangedSignalType mCursorPositionChangedSignal; + Toolkit::DevelTextField::SelectionChangedSignalType mSelectionChangedSignal; + Toolkit::DevelTextField::SelectionClearedSignalType mSelectionClearedSignal; + + InputMethodContext mInputMethodContext; + Text::ControllerPtr mController; + Text::RendererPtr mRenderer; + Text::DecoratorPtr mDecorator; + Toolkit::Control mStencil; ///< For EXCEED_POLICY_CLIP + std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. + std::vector mAnchorActors; + Dali::InputMethodOptions mInputMethodOptions; Actor mRenderableActor; Actor mActiveLayer; @@ -399,15 +461,28 @@ private: // Data int mRenderingBackend; int mExceedPolicy; bool mHasBeenStaged : 1; - bool mTextChanged : 1; ///< If true, emits TextChangedSignal in next OnRelayout(). + bool mTextChanged : 1; ///< If true, emits TextChangedSignal in next OnRelayout(). + bool mCursorPositionChanged : 1; ///< If true, emits CursorPositionChangedSignal at the end of OnRelayout(). + bool mSelectionChanged : 1; ///< If true, emits SelectionChangedSignal at the end of OnRelayout(). + bool mSelectionCleared : 1; ///< If true, emits SelectionClearedSignal at the end of OnRelayout(). + + //args for cursor position changed event + unsigned int mOldPosition; + + //args for selection changed event + uint32_t mOldSelectionStart; + uint32_t mOldSelectionEnd; protected: + struct PropertyHandler; + /** * @brief This structure is to connect TextField with Accessible functions. */ struct AccessibleImpl : public DevelControl::AccessibleImpl, public virtual Dali::Accessibility::Text, - public virtual Dali::Accessibility::EditableText + public virtual Dali::Accessibility::EditableText, + public virtual Dali::Accessibility::Hypertext { using DevelControl::AccessibleImpl::AccessibleImpl; @@ -485,6 +560,21 @@ protected: * @copydoc Dali::Accessibility::EditableText::DeleteText() */ bool DeleteText(size_t startPosition, size_t endPosition) override; + + /** + * @copydoc Dali::Accessibility::Hypertext::GetLink() + */ + Accessibility::Hyperlink* GetLink(int32_t linkIndex) const override; + + /** + * @copydoc Dali::Accessibility::Hypertext::GetLinkIndex() + */ + int32_t GetLinkIndex(int32_t characterOffset) const override; + + /** + * @copydoc Dali::Accessibility::Hypertext::GetLinkCount() + */ + int32_t GetLinkCount() const override; }; };