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=236cb7fbd294448c1013d83681301c8e02a24329;hp=cb404068561935cbfbd8ede0d0dcab4285a2ec82;hb=60d99d04d7677a1b91d4f2fdd9e74bc5e1b5e7bf;hpb=260c832bfaa0294e74a4f96d321f149adf09a3ce diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h old mode 100644 new mode 100755 index cb40406..236cb7f --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H__ -#define __DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H +#define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H /* - * Copyright (c) 2016 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. @@ -18,18 +18,24 @@ * */ +// EXTERNAL INCLUDES +#include +#include +#include + // INTERNAL INCLUDES #include +#include #include -#include +#include #include #include +#include +#include #include +#include #include -// EXTERNAL INCLUDES -#include - namespace Dali { @@ -38,11 +44,10 @@ namespace Toolkit namespace Internal { - /** * @brief A control which renders a long text string with styles. */ -class TextEditor : public Control, public Text::ControlInterface +class TextEditor : public Control, public Text::ControlInterface, public Text::EditableControlInterface, public Text::SelectableControlInterface { public: @@ -72,6 +77,16 @@ public: static Property::Value GetProperty( BaseObject* object, Property::Index index ); /** + * @copydoc Dali::Toollkit::TextEditor::GetInputMethodContext() + */ + InputMethodContext GetInputMethodContext(); + + /** + * @copydoc Dali::Toollkit::TextEditor::MaxLengthReachedSignal() + */ + DevelTextEditor::MaxLengthReachedSignalType& MaxLengthReachedSignal(); + + /** * 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. @@ -92,101 +107,121 @@ public: */ Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal(); + /** + * @copydoc TextEditor::ScrollStateChangedSignal() + */ + Toolkit::TextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal(); + 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::AddDecoration() - */ - virtual void AddDecoration( Actor& actor, bool needsClipping ); - - /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ - virtual void RequestTextRelayout(); + void RequestTextRelayout() override; + +// From EditableControlInterface /** * @copydoc Text::ControlInterface::TextChanged() */ - virtual void TextChanged(); + void TextChanged() override; /** * @copydoc Text::ControlInterface::MaxLengthReached() */ - virtual void MaxLengthReached(); + void MaxLengthReached() override; /** * @copydoc Text::ControlInterface::InputStyleChanged() */ - virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ); + void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override; + + /** + * @copydoc Text::ControlInterface::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; 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 @@ -203,19 +238,18 @@ private: // Implementation void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType ); /** - * @brief Enable or disable clipping. + * @brief Callback when keyboard is shown/hidden. * - * @param[in] clipping True if clipping should be enabled. - * @param[in] size The area to clip within. + * @param[in] keyboardShown True if keyboard is shown. */ - void EnableClipping( bool clipping, const Vector2& size ); + void KeyboardStatusChanged( bool keyboardShown ); /** - * @brief Callback when keyboard is shown/hidden. + * @brief update scroll bar position * - * @param[in] keyboardShown True if keyboard is shown. + * If text scroll is occurred, create or update scroll bar position */ - void KeyboardStatusChanged( bool keyboardShown ); + void UpdateScrollBar(); /** * @brief Callback when TextEditor is touched @@ -223,7 +257,7 @@ private: // Implementation * @param[in] actor TextEditor 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. @@ -233,6 +267,20 @@ private: // Implementation void OnIdleSignal(); /** + * @brief set RenderActor's position with new scrollPosition + * + * Apply updated scroll position or start scroll animation if VerticalScrollAnimation is enabled + */ + void ApplyScrollPosition(); + + /** + * @brief Callback function for ScrollBar indicator animation finished signal + * + * Emit ScrollBarStateChanged Signal and toggle mScrollStarted flag to false + */ + void OnScrollIndicatorAnimationFinished( Animation& animation ); + + /** * Construct a new TextEditor. */ TextEditor(); @@ -251,26 +299,39 @@ private: // Implementation */ void RenderText( Text::Controller::UpdateTextType updateTextType ); - // Connection needed to re-render text, when a text editor returns to the stage. - void OnStageConnect( Dali::Actor actor ); + // Connection needed to re-render text, when a text editor returns to the scene. + void OnSceneConnect( Dali::Actor actor ); private: // Data - // Signals Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal; Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal; + Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal; + Toolkit::DevelTextEditor::MaxLengthReachedSignalType mMaxLengthReachedSignal; + InputMethodContext mInputMethodContext; Text::ControllerPtr mController; Text::RendererPtr mRenderer; Text::DecoratorPtr mDecorator; - Text::ClipperPtr mClipper; + Text::TextVerticalScrollerPtr mTextVerticalScroller; + Toolkit::Control mStencil; + Toolkit::ScrollBar mScrollBar; + Dali::Animation mAnimation; ///< Scroll indicator Show/Hide Animation. + Dali::TimePeriod mAnimationPeriod; std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. Actor mRenderableActor; + Actor mActiveLayer; CallbackBase* mIdleCallback; + float mAlignmentOffset; + float mScrollAnimationDuration; + float mLineSpacing; int mRenderingBackend; bool mHasBeenStaged:1; + bool mScrollAnimationEnabled:1; + bool mScrollBarEnabled:1; + bool mScrollStarted:1; }; } // namespace Internal @@ -299,4 +360,4 @@ inline const Toolkit::Internal::TextEditor& GetImpl( const Toolkit::TextEditor& } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H__ +#endif // DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H