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=07a7a374511c3519f0127def51b00bf6c19bcd7c;hp=329d7b5a708b57e1cb998150fbed7d6b9ed27cdf;hb=33ccee79d16a90d5f7ab427de1503ccc5bee4324;hpb=eac3e6ee30183868f1af12addd94e7f2fc467ed7 diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h old mode 100755 new mode 100644 index 329d7b5..07a7a37 --- 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) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -23,21 +23,21 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include #include +#include #include +#include #include #include -#include -#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { /** @@ -46,7 +46,6 @@ namespace Internal class TextField : public Control, public Text::ControlInterface, public Text::EditableControlInterface, public Text::SelectableControlInterface { public: - /** * @copydoc Dali::Toollkit::TextField::New() */ @@ -61,7 +60,7 @@ public: * @param[in] index The property index. * @param[in] value The new property value. */ - static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ); + static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value); /** * @brief Called to retrieve a property of an object of this type. @@ -70,7 +69,7 @@ public: * @param[in] index The property index. * @return The current value of the property. */ - static Property::Value GetProperty( BaseObject* object, Property::Index index ); + static Property::Value GetProperty(BaseObject* object, Property::Index index); /** * @copydoc Dali::Toollkit::TextField::GetInputMethodContext() @@ -86,25 +85,26 @@ public: * @return True if the signal was connected. * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. */ - static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); + static bool DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor); /** * @copydoc TextField::TextChangedSignal() */ - Toolkit::TextField::TextChangedSignalType& TextChangedSignal(); + Toolkit::TextField::TextChangedSignalType& TextChangedSignal(); /** * @copydoc TextField::MaxLengthReachedSignal() */ - Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal(); + Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal(); /** * @copydoc TextField::TextChangedSignal() */ Toolkit::TextField::InputStyleChangedSignalType& InputStyleChangedSignal(); -private: // From Control + Text::ControllerPtr getController(); +private: // From Control /** * @copydoc Control::OnInitialize() */ @@ -113,7 +113,7 @@ private: // From Control /** * @copydoc Control::OnStyleChange() */ - void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override; + void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) override; /** * @copydoc Control::GetNaturalSize() @@ -123,12 +123,12 @@ private: // From Control /** * @copydoc Control::GetHeightForWidth() */ - float GetHeightForWidth( float width ) override; + float GetHeightForWidth(float width) override; /** * @copydoc Control::OnInitialize() */ - void OnRelayout( const Vector2& size, RelayoutContainer& container ) override; + void OnRelayout(const Vector2& size, RelayoutContainer& container) override; /** * @copydoc Control::OnKeyInputFocusGained() @@ -141,38 +141,58 @@ private: // From Control void OnKeyInputFocusLost() override; /** + * @copydoc Control::OnAccessibilityActivated() + */ + bool OnAccessibilityActivated() override; + + /** * @copydoc Control::OnTap() */ - void OnTap( const TapGesture& tap ) override; + void OnTap(const TapGesture& tap) override; /** * @copydoc Control::OnPan() */ - void OnPan( const PanGesture& gesture ) override; + void OnPan(const PanGesture& gesture) override; /** * @copydoc Control::OnLongPress() */ - void OnLongPress( const LongPressGesture& gesture ) override; + void OnLongPress(const LongPressGesture& gesture) override; /** * @copydoc Control::OnSceneConnection() */ - void OnSceneConnection( int depth ) override; + void OnSceneConnection(int depth) override; /** * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&) */ bool OnKeyEvent(const KeyEvent& event) override; -// From ControlInterface + // From ControlInterface /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ void RequestTextRelayout() override; -// From EditableControlInterface + // From EditableControlInterface + + /** + * @copydoc Text::EditableControlInterface::TextChanged() + */ + void TextInserted(unsigned int position, unsigned int length, const std::string& content) override; + + /** + * @copydoc Text::EditableControlInterface::TextDeleted() + */ + void TextDeleted(unsigned int position, unsigned int length, const std::string& content) override; + + /** + * @copydoc Text::EditableControlInterface::CaretMoved() + */ + void CaretMoved(unsigned int position) override; /** * @copydoc Text::EditableControlInterface::TextChanged() @@ -187,19 +207,19 @@ private: // From Control /** * @copydoc Text::EditableControlInterface::InputStyleChanged() */ - void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override; + void InputStyleChanged(Text::InputStyle::Mask inputStyleMask) override; /** * @copydoc Text::EditableControlInterface::AddDecoration() */ - void AddDecoration( Actor& actor, bool needsClipping ) override; + void AddDecoration(Actor& actor, bool needsClipping) override; -// From SelectableControlInterface + // From SelectableControlInterface public: /** * @copydoc Text::SelectableControlInterface::SetTextSelectionRange() */ - void SetTextSelectionRange(const uint32_t *start, const uint32_t *end) override; + void SetTextSelectionRange(const uint32_t* start, const uint32_t* end) override; /** * @copydoc Text::SelectableControlInterface::GetTextSelectionRange() @@ -229,20 +249,19 @@ public: /** * @copydoc Text::EditableControlInterface::SetEditable() */ - void SetEditable( bool editable ) override; + void SetEditable(bool editable) override; private: // Implementation - /** * @copydoc Dali::Toolkit::Text::Controller::(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) */ - InputMethodContext::CallbackData OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ); + InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent); /** * @brief Callback when Clipboard signals an item should be pasted * @param[in] clipboard handle to Clipboard Event Notifier */ - void OnClipboardTextSelected( ClipboardEventNotifier& clipboard ); + void OnClipboardTextSelected(ClipboardEventNotifier& clipboard); /** * @brief Get a Property Map for the image used for the required Handle Image @@ -250,7 +269,7 @@ private: // Implementation * @param[in] handleType the type of handle * @param[in] handleImageType the type of image for the given handleType */ - void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType ); + void GetHandleImagePropertyValue(Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType); /** * @brief Enable or disable clipping. @@ -262,7 +281,7 @@ private: // Implementation * * @param[in] keyboardShown True if keyboard is shown. */ - void KeyboardStatusChanged( bool keyboardShown ); + void KeyboardStatusChanged(bool keyboardShown); /** * @brief Callback when TextField is touched @@ -270,7 +289,7 @@ private: // Implementation * @param[in] actor TextField touched * @param[in] touch Touch information */ - bool OnTouched( Actor actor, const TouchEvent& touch ); + bool OnTouched(Actor actor, const TouchEvent& touch); /** * @brief Callbacks called on idle. @@ -294,48 +313,79 @@ private: // Implementation TextField& operator=(const TextField& 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 Field. */ - void RenderText( Text::Controller::UpdateTextType updateTextType ); + void RenderText(Text::Controller::UpdateTextType updateTextType); // Connection needed to re-render text, when a Text Field returns to the scene. - void OnSceneConnect( Dali::Actor actor ); + void OnSceneConnect(Dali::Actor actor); public: // For UTC only - - Text::ControllerPtr GetTextController() { return mController; } + Text::ControllerPtr GetTextController() + { + return mController; + } private: // Data - // Signals - Toolkit::TextField::TextChangedSignalType mTextChangedSignal; - Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; + Toolkit::TextField::TextChangedSignalType mTextChangedSignal; + Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; Toolkit::TextField::InputStyleChangedSignalType mInputStyleChangedSignal; - 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. + 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; - Actor mRenderableActor; - Actor mActiveLayer; - Actor mBackgroundActor; + Actor mRenderableActor; + Actor mActiveLayer; + Actor mBackgroundActor; CallbackBase* mIdleCallback; float mAlignmentOffset; - int mRenderingBackend; - int mExceedPolicy; - bool mHasBeenStaged:1; + int mRenderingBackend; + int mExceedPolicy; + bool mHasBeenStaged : 1; + bool mTextChanged : 1; + +protected: + struct AccessibleImpl : public DevelControl::AccessibleImpl, + public virtual Dali::Accessibility::Text, + public virtual Dali::Accessibility::EditableText + { + using DevelControl::AccessibleImpl::AccessibleImpl; + + std::string GetName() override; + std::string GetText(size_t startOffset, size_t endOffset) override; + size_t GetCharacterCount() override; + size_t GetCaretOffset() override; + bool SetCaretOffset(size_t offset) override; + Accessibility::Range GetTextAtOffset(size_t offset, Accessibility::TextBoundary boundary) override; + Accessibility::Range GetSelection(size_t selectionNum) override; + bool RemoveSelection(size_t selectionNum) override; + bool SetSelection(size_t selectionNum, size_t startOffset, size_t endOffset) override; + bool CopyText(size_t startPosition, size_t endPosition) override; + bool CutText(size_t startPosition, size_t endPosition) override; + Accessibility::States CalculateStates() override; + }; }; } // namespace Internal // Helpers for public-api forwarding methods -inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& textField ) +inline Toolkit::Internal::TextField& GetImpl(Toolkit::TextField& textField) { DALI_ASSERT_ALWAYS(textField); @@ -344,7 +394,7 @@ inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& textField ) return static_cast(handle); } -inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& textField ) +inline const Toolkit::Internal::TextField& GetImpl(const Toolkit::TextField& textField) { DALI_ASSERT_ALWAYS(textField);