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=329d7b5a708b57e1cb998150fbed7d6b9ed27cdf;hp=b8f49eec9a03ef94140fdf713b9943059a0c899b;hb=27e7fb1ad1e36527c7af8b739ec49ac19b4ff309;hpb=3994a8fa38310fc7dd7bbfbf37c982cea8d199da 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 100644 new mode 100755 index b8f49ee..329d7b5 --- 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) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include @@ -27,6 +28,7 @@ #include #include #include +#include #include #include @@ -38,11 +40,10 @@ namespace Toolkit namespace Internal { - /** * @brief A control which renders a short text string. */ -class TextField : public Control, public Text::ControlInterface, public Text::EditableControlInterface +class TextField : public Control, public Text::ControlInterface, public Text::EditableControlInterface, public Text::SelectableControlInterface { public: @@ -72,6 +73,11 @@ public: static Property::Value GetProperty( BaseObject* object, Property::Index index ); /** + * @copydoc Dali::Toollkit::TextField::GetInputMethodContext() + */ + InputMethodContext GetInputMethodContext(); + + /** * 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. @@ -102,98 +108,135 @@ private: // From Control /** * @copydoc Control::OnInitialize() */ - virtual void OnInitialize(); + void OnInitialize() override; /** * @copydoc Control::OnStyleChange() */ - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); + void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override; /** * @copydoc Control::GetNaturalSize() */ - virtual Vector3 GetNaturalSize(); + Vector3 GetNaturalSize() override; /** * @copydoc Control::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + float GetHeightForWidth( float width ) override; /** * @copydoc Control::OnInitialize() */ - virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + void OnRelayout( const Vector2& size, RelayoutContainer& container ) override; /** * @copydoc Control::OnKeyInputFocusGained() */ - virtual void OnKeyInputFocusGained(); + void OnKeyInputFocusGained() override; /** * @copydoc Control::OnKeyInputFocusLost() */ - virtual void OnKeyInputFocusLost(); + void OnKeyInputFocusLost() override; /** * @copydoc Control::OnTap() */ - virtual void OnTap( const TapGesture& tap ); + void OnTap( const TapGesture& tap ) override; /** * @copydoc Control::OnPan() */ - virtual void OnPan( const PanGesture& gesture ); + void OnPan( const PanGesture& gesture ) override; /** * @copydoc Control::OnLongPress() */ - virtual void OnLongPress( const LongPressGesture& gesture ); + void OnLongPress( const LongPressGesture& gesture ) override; /** - * @copydoc Control::OnStageConnection() + * @copydoc Control::OnSceneConnection() */ - virtual void OnStageConnection( int depth ); + void OnSceneConnection( int depth ) override; /** * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&) */ - virtual bool OnKeyEvent(const KeyEvent& event); + bool OnKeyEvent(const KeyEvent& event) override; // From ControlInterface /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ - virtual void RequestTextRelayout(); + void RequestTextRelayout() override; // From EditableControlInterface /** - * @copydoc Text::ControlInterface::TextChanged() + * @copydoc Text::EditableControlInterface::TextChanged() + */ + void TextChanged() override; + + /** + * @copydoc Text::EditableControlInterface::MaxLengthReached() + */ + void MaxLengthReached() override; + + /** + * @copydoc Text::EditableControlInterface::InputStyleChanged() + */ + void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override; + + /** + * @copydoc Text::EditableControlInterface::AddDecoration() + */ + void AddDecoration( Actor& actor, bool needsClipping ) override; + +// From SelectableControlInterface +public: + /** + * @copydoc Text::SelectableControlInterface::SetTextSelectionRange() + */ + void SetTextSelectionRange(const uint32_t *start, const uint32_t *end) override; + + /** + * @copydoc Text::SelectableControlInterface::GetTextSelectionRange() + */ + Uint32Pair GetTextSelectionRange() const override; + + /** + * @copydoc Text::SelectableControlInterface::SelectWholeText() */ - virtual void TextChanged(); + void SelectWholeText() override; /** - * @copydoc Text::ControlInterface::MaxLengthReached() + * @copydoc Text::SelectableControlInterface::SelectNone() */ - virtual void MaxLengthReached(); + void SelectNone() override; /** - * @copydoc Text::ControlInterface::InputStyleChanged() + * @copydoc Text::SelectableControlInterface::GetSelectedText() */ - virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ); + string GetSelectedText() const override; /** - * @copydoc Text::ControlInterface::AddDecoration() + * @copydoc Text::EditableControlInterface::IsEditable() */ - virtual void AddDecoration( Actor& actor, bool needsClipping ); + bool IsEditable() const override; + + /** + * @copydoc Text::EditableControlInterface::SetEditable() + */ + void SetEditable( bool editable ) override; private: // Implementation /** - * @copydoc Dali::Toolkit::Text::Controller::(ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent) + * @copydoc Dali::Toolkit::Text::Controller::(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) */ - ImfManager::ImfCallbackData OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ); + InputMethodContext::CallbackData OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ); /** * @brief Callback when Clipboard signals an item should be pasted @@ -227,7 +270,7 @@ private: // Implementation * @param[in] actor TextField touched * @param[in] touch Touch information */ - bool OnTouched( Actor actor, const TouchData& touch ); + bool OnTouched( Actor actor, const TouchEvent& touch ); /** * @brief Callbacks called on idle. @@ -255,8 +298,12 @@ private: // Implementation */ void RenderText( Text::Controller::UpdateTextType updateTextType ); - // Connection needed to re-render text, when a Text Field returns to the stage. - void OnStageConnect( Dali::Actor actor ); + // Connection needed to re-render text, when a Text Field returns to the scene. + void OnSceneConnect( Dali::Actor actor ); + +public: // For UTC only + + Text::ControllerPtr GetTextController() { return mController; } private: // Data @@ -265,7 +312,7 @@ private: // Data Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; Toolkit::TextField::InputStyleChangedSignalType mInputStyleChangedSignal; - ImfManager mImfManager; + InputMethodContext mInputMethodContext; Text::ControllerPtr mController; Text::RendererPtr mRenderer; Text::DecoratorPtr mDecorator; @@ -275,6 +322,7 @@ private: // Data Actor mRenderableActor; Actor mActiveLayer; + Actor mBackgroundActor; CallbackBase* mIdleCallback; float mAlignmentOffset;