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-editor-impl.h;h=5739ac2b1cfd2baf312e23a7796cd0ff7f030476;hp=9d417356e1c1097fc6bbe1dd98d8bee08711cf16;hb=36b6c48b03fa926529904947f222aadebbf0c1ff;hpb=12fc433eba468fe62254c4ebfb04d57697632077 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 9d41735..5739ac2 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_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. @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include #include // INTERNAL INCLUDES @@ -29,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -113,6 +117,11 @@ public: DevelTextEditor::SelectionClearedSignalType& SelectionClearedSignal(); /** + * @copydoc Dali::Toollkit::TextEditor::SelectionStartedSignal() + */ + DevelTextEditor::SelectionStartedSignalType& SelectionStartedSignal(); + + /** * 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. @@ -152,6 +161,11 @@ private: // From Control void OnInitialize() override; /** + * @copydoc Toolkit::Internal::Control::CreateAccessibleObject() + */ + DevelControl::ControlAccessible* CreateAccessibleObject() override; + + /** * @copydoc Control::OnStyleChange() */ void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) override; @@ -258,7 +272,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() @@ -445,6 +459,11 @@ private: // Implementation void EmitSelectionClearedSignal(); /** + * @brief Emits SelectionStarted signal. + */ + void EmitSelectionStartedSignal(); + + /** * @brief set RenderActor's position with new scrollPosition * * Apply updated scroll position or start scroll animation if VerticalScrollAnimation is enabled @@ -466,6 +485,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 TextEditor. */ TextEditor(); @@ -509,6 +535,7 @@ private: // Data Toolkit::DevelTextEditor::CursorPositionChangedSignalType mCursorPositionChangedSignal; Toolkit::DevelTextEditor::SelectionChangedSignalType mSelectionChangedSignal; Toolkit::DevelTextEditor::SelectionClearedSignalType mSelectionClearedSignal; + Toolkit::DevelTextEditor::SelectionStartedSignalType mSelectionStartedSignal; InputMethodContext mInputMethodContext; Text::ControllerPtr mController; @@ -525,6 +552,7 @@ private: // Data Actor mRenderableActor; Actor mActiveLayer; + Actor mCursorLayer; Actor mBackgroundActor; CallbackBase* mIdleCallback; @@ -548,107 +576,38 @@ private: // Data uint32_t mOldSelectionStart; uint32_t mOldSelectionEnd; + bool mSelectionStarted : 1; ///< If true, emits SelectionStartedSignal at the end of OnRelayout(). + struct PropertyHandler; /** * @brief This structure is to connect TextEditor with Accessible functions. */ - struct AccessibleImpl : public DevelControl::AccessibleImpl, - public virtual Dali::Accessibility::Text, - public virtual Dali::Accessibility::EditableText, - public virtual Dali::Accessibility::Hypertext + class TextEditorAccessible : public EditableTextControlAccessible { - using DevelControl::AccessibleImpl::AccessibleImpl; + public: + using EditableTextControlAccessible::EditableTextControlAccessible; /** * @copydoc Dali::Accessibility::Accessible::GetName() */ - std::string GetName() override; - - /** - * @copydoc Dali::Accessibility::Text::GetText() - */ - std::string GetText(size_t startOffset, size_t endOffset) override; - - /** - * @copydoc Dali::Accessibility::Text::GetCharacterCount() - */ - size_t GetCharacterCount() override; - - /** - * @copydoc Dali::Accessibility::Text::GetCursorOffset() - */ - size_t GetCursorOffset() 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) override; - - /** - * @copydoc Dali::Accessibility::Text::GetRangeOfSelection() - */ - Accessibility::Range GetRangeOfSelection(size_t selectionIndex) 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() - */ - bool SetTextContents(std::string newContents) override; - - /** - * @copydoc Dali::Accessibility::EditableText::DeleteText() - */ - bool DeleteText(size_t startPosition, size_t endPosition) override; + std::string GetName() const override; + protected: /** - * @copydoc Dali::Accessibility::Hypertext::GetLink() + * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextAnchors() */ - Accessibility::Hyperlink* GetLink(int32_t linkIndex) const override; + const std::vector& GetTextAnchors() const override; /** - * @copydoc Dali::Accessibility::Hypertext::GetLinkIndex() + * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextController() */ - int32_t GetLinkIndex(int32_t characterOffset) const override; + Toolkit::Text::ControllerPtr GetTextController() const override; /** - * @copydoc Dali::Accessibility::Hypertext::GetLinkCount() + * @copydoc Dali::Toolkit::Internal::EditableTextControlAccessible::RequestTextRelayout() */ - int32_t GetLinkCount() const override; + void RequestTextRelayout() override; }; };