X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.h;h=0cae2a368a2bbc1f6157cfb8ade20b53934e6973;hb=26efc210fc636e51a4d3df9ae7fbcc1d2a8bac40;hp=bd02762ff613580531b95552ef7222da52665bba;hpb=78d6c4118411aa10112953fe6844eb08c944dd59;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 bd02762..0cae2a3 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__ -#define __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H +#define DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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,17 +18,20 @@ * */ +// EXTERNAL INCLUDES +#include +#include +#include + // INTERNAL INCLUDES #include #include -#include #include #include +#include #include #include - -// EXTERNAL INCLUDES -#include +#include namespace Dali { @@ -38,11 +41,10 @@ namespace Toolkit namespace Internal { - /** * @brief A control which renders a short text string. */ -class TextField : public Control, public Text::ControlInterface +class TextField : public Control, public Text::ControlInterface, public Text::EditableControlInterface { public: @@ -72,6 +74,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. @@ -92,6 +99,18 @@ public: */ Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal(); + /** + * @copydoc TextField::TextChangedSignal() + */ + Toolkit::TextField::InputStyleChangedSignalType& InputStyleChangedSignal(); + + /** + * @brief Called to select the whole texts. + */ + void SelectWholeText(); + + Text::ControllerPtr getController(); + private: // From Control /** @@ -157,14 +176,26 @@ private: // From Control // From ControlInterface /** - * @copydoc Text::ControlInterface::AddDecoration() + * @copydoc Text::ControlInterface::RequestTextRelayout() */ - virtual void AddDecoration( Actor& actor, bool needsClipping ); + virtual void RequestTextRelayout(); + +// From EditableControlInterface /** - * @copydoc Text::ControlInterface::RequestTextRelayout() + * @copydoc Text::ControlInterface::TextInserted() */ - virtual void RequestTextRelayout(); + virtual void TextInserted( unsigned int position, unsigned int length, const std::string &content ); + + /** + * @copydoc Text::ControlInterface::TextDeleted() + */ + virtual void TextDeleted( unsigned int position, unsigned int length, const std::string &content ); + + /** + * @copydoc Text::ControlInterface::CaretMoved() + */ + virtual void CaretMoved( unsigned int position ); /** * @copydoc Text::ControlInterface::TextChanged() @@ -176,12 +207,22 @@ private: // From Control */ virtual void MaxLengthReached(); + /** + * @copydoc Text::ControlInterface::InputStyleChanged() + */ + virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ); + + /** + * @copydoc Text::ControlInterface::AddDecoration() + */ + virtual void AddDecoration( Actor& actor, bool needsClipping ); + 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 @@ -199,11 +240,8 @@ private: // Implementation /** * @brief Enable or disable clipping. - * - * @param[in] clipping True if clipping should be enabled. - * @param[in] size The area to clip within. */ - void EnableClipping( bool clipping, const Vector2& size ); + void EnableClipping(); /** * @brief Callback when keyboard is shown/hidden. @@ -221,6 +259,13 @@ private: // Implementation bool OnTouched( Actor actor, const TouchData& touch ); /** + * @brief Callbacks called on idle. + * + * If there are notifications of change of input style on the queue, Toolkit::TextField::InputStyleChangedSignal() are emitted. + */ + void OnIdleSignal(); + + /** * Construct a new TextField. */ TextField(); @@ -237,7 +282,7 @@ private: // Implementation /** * @brief Render view, create and attach actor(s) to this Text Field. */ - void RenderText(); + 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 ); @@ -247,18 +292,49 @@ private: // Data // Signals Toolkit::TextField::TextChangedSignalType mTextChangedSignal; Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; + Toolkit::TextField::InputStyleChangedSignalType mInputStyleChangedSignal; + InputMethodContext mInputMethodContext; Text::ControllerPtr mController; Text::RendererPtr mRenderer; Text::DecoratorPtr mDecorator; - Text::ClipperPtr mClipper; ///< For EXCEED_POLICY_CLIP + Toolkit::Control mStencil; ///< For EXCEED_POLICY_CLIP std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. + Dali::InputMethodOptions mInputMethodOptions; + Dali::AutofillItem mAutofillItem; Actor mRenderableActor; + Actor mActiveLayer; + CallbackBase* mIdleCallback; + float mAlignmentOffset; int mRenderingBackend; int mExceedPolicy; bool mHasBeenStaged:1; + +protected: + struct AccessibleImpl : public Control::Impl::AccessibleImpl, + public virtual Dali::Accessibility::Text, + public virtual Dali::Accessibility::EditableText + { + using Control::Impl::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; + Dali::Accessibility::Range + GetTextAtOffset( size_t offset, + Dali::Accessibility::TextBoundary boundary ) override; + Dali::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; + Dali::Accessibility::States CalculateStates() override; + }; }; } // namespace Internal @@ -287,4 +363,4 @@ inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& te } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__ +#endif // DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H