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=413c06905d1b230bb798fd7c8a39b162c9e104ed;hp=2be707235c8081f6a81703eec2987226382267fd;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=d13e8792c0e8dd0a3f5fb167ca9ee7c0155b7afc 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 2be7072..413c069 --- 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) 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. @@ -20,14 +20,19 @@ // EXTERNAL INCLUDES #include +#include +#include // INTERNAL INCLUDES #include +#include #include +#include #include #include #include #include +#include #include namespace Dali @@ -38,7 +43,6 @@ namespace Toolkit namespace Internal { - /** * @brief A control which renders a long text string with styles. */ @@ -72,6 +76,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,6 +106,11 @@ public: */ Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal(); + /** + * @copydoc TextEditor::ScrollStateChangedSignal() + */ + Toolkit::TextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal(); + private: // From Control /** @@ -145,9 +164,9 @@ private: // From Control virtual void OnLongPress( const LongPressGesture& gesture ); /** - * @copydoc Control::OnStageConnection() + * @copydoc Control::OnSceneConnection() */ - virtual void OnStageConnection( int depth ); + virtual void OnSceneConnection( int depth ); /** * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&) @@ -186,9 +205,9 @@ private: // From Control 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 @@ -212,12 +231,19 @@ private: // Implementation void KeyboardStatusChanged( bool keyboardShown ); /** + * @brief update scroll bar position + * + * If text scroll is occurred, create or update scroll bar position + */ + void UpdateScrollBar(); + + /** * @brief Callback when TextEditor is touched * * @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. @@ -227,6 +253,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(); @@ -245,27 +285,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::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