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=223fa71c7f518271b5070d766b898600037cbd0c;hp=e53189eabec241239a607d722c351e9a411ddcb0;hb=549e79b19f4d24588121f55739f9fc53e00fcdaf;hpb=9a5ce98a301f74f8df8a3be6d223b525c8839b0b 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 e53189e..223fa71 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -139,6 +140,11 @@ public: */ DevelTextField::SelectionClearedSignalType& SelectionClearedSignal(); + /** + * @copydoc TextField::SelectionStartedSignal() + */ + DevelTextField::SelectionStartedSignalType& SelectionStartedSignal(); + private: // From Control /** * @copydoc Control::OnInitialize() @@ -252,7 +258,7 @@ private: // From Control /** * @copydoc Text::EditableControlInterface::AddDecoration() */ - void AddDecoration(Actor& actor, bool needsClipping) override; + void AddDecoration(Actor& actor, Toolkit::Text::DecorationType type, bool needsClipping) override; /** * @copydoc Text::EditableControlInterface::InputFiltered() @@ -266,6 +272,7 @@ private: // From Control // From SelectableControlInterface public: + /** * @copydoc Text::SelectableControlInterface::SetTextSelectionRange() */ @@ -418,6 +425,11 @@ private: // Implementation void EmitSelectionClearedSignal(); /** + * @brief Emits SelectionStarted signal. + */ + void EmitSelectionStartedSignal(); + + /** * @brief Callback function for when the layout is changed. * @param[in] actor The actor whose layoutDirection is changed. * @param[in] type The layoutDirection. @@ -425,6 +437,13 @@ private: // Implementation void OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type); /** + * @brief Add a layer for active or cursor. + * @param[in] layer The actor in which to store the layer. + * @param[in] actor The new layer to add. + */ + void AddLayer(Actor& layer, Actor& actor); + + /** * Construct a new TextField. */ TextField(); @@ -467,6 +486,7 @@ private: // Data Toolkit::DevelTextField::CursorPositionChangedSignalType mCursorPositionChangedSignal; Toolkit::DevelTextField::SelectionChangedSignalType mSelectionChangedSignal; Toolkit::DevelTextField::SelectionClearedSignalType mSelectionClearedSignal; + Toolkit::DevelTextField::SelectionStartedSignalType mSelectionStartedSignal; InputMethodContext mInputMethodContext; Text::ControllerPtr mController; @@ -479,6 +499,7 @@ private: // Data Actor mRenderableActor; Actor mActiveLayer; + Actor mCursorLayer; Actor mBackgroundActor; CallbackBase* mIdleCallback; @@ -498,107 +519,49 @@ private: // Data uint32_t mOldSelectionStart; uint32_t mOldSelectionEnd; + bool mSelectionStarted : 1; ///< If true, emits SelectionStartedSignal at the end of OnRelayout(). + protected: struct PropertyHandler; /** * @brief This structure is to connect TextField with Accessible functions. */ - struct AccessibleImpl : public DevelControl::ControlAccessible, - public virtual Dali::Accessibility::EditableText, - public virtual Dali::Accessibility::Hypertext + class TextFieldAccessible : public EditableTextControlAccessible { - using DevelControl::ControlAccessible::ControlAccessible; + public: + using EditableTextControlAccessible::EditableTextControlAccessible; /** * @copydoc Dali::Accessibility::Accessible::GetName() */ std::string GetName() const override; + protected: /** - * @copydoc Dali::Accessibility::Text::GetText() - */ - std::string GetText(size_t startOffset, size_t endOffset) const override; - - /** - * @copydoc Dali::Accessibility::Text::GetCharacterCount() - */ - size_t GetCharacterCount() const override; - - /** - * @copydoc Dali::Accessibility::Text::GetCursorOffset() - */ - size_t GetCursorOffset() const override; - - /** - * @copydoc Dali::Accessibility::Text::SetCursorOffset() - */ - bool SetCursorOffset(size_t offset) override; - - /** - * @copydoc Dali::Accessibility::Text::GetTextAtOffset() - */ - Accessibility::Range GetTextAtOffset(size_t offset, Accessibility::TextBoundary boundary) const override; - - /** - * @copydoc Dali::Accessibility::Text::GetRangeOfSelection() - */ - Accessibility::Range GetRangeOfSelection(size_t selectionIndex) const override; - - /** - * @copydoc Dali::Accessibility::Text::RemoveSelection() - */ - bool RemoveSelection(size_t selectionIndex) override; - - /** - * @copydoc Dali::Accessibility::Text::SetRangeOfSelection() - */ - bool SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset) override; - - /** - * @copydoc Dali::Accessibility::EditableText::CopyText() - */ - bool CopyText(size_t startPosition, size_t endPosition) override; - - /** - * @copydoc Dali::Accessibility::EditableText::CutText() - */ - bool CutText(size_t startPosition, size_t endPosition) override; - - /** - * @copydoc Dali::Accessibility::Accessible::GetStates() - */ - Accessibility::States CalculateStates() override; - - /** - * @copydoc Dali::Accessibility::EditableText::InsertText() - */ - bool InsertText(size_t startPosition, std::string text) override; - - /** - * @copydoc Dali::Accessibility::EditableText::SetTextContents() + * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextAnchors() */ - bool SetTextContents(std::string newContents) override; + const std::vector& GetTextAnchors() const override; /** - * @copydoc Dali::Accessibility::EditableText::DeleteText() + * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextController() */ - bool DeleteText(size_t startPosition, size_t endPosition) override; + Toolkit::Text::ControllerPtr GetTextController() const override; /** - * @copydoc Dali::Accessibility::Hypertext::GetLink() + * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetSubstituteCharacter() */ - Accessibility::Hyperlink* GetLink(int32_t linkIndex) const override; + std::uint32_t GetSubstituteCharacter() const override; /** - * @copydoc Dali::Accessibility::Hypertext::GetLinkIndex() + * @copydoc Dali::Toolkit::Internal::TextControlAccessible::IsHiddenInput() */ - int32_t GetLinkIndex(int32_t characterOffset) const override; + bool IsHiddenInput() const override; /** - * @copydoc Dali::Accessibility::Hypertext::GetLinkCount() + * @copydoc Dali::Toolkit::Internal::EditableTextControlAccessible::RequestTextRelayout() */ - int32_t GetLinkCount() const override; + void RequestTextRelayout() override; }; };