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=2991931f2439faa6b8326b06fabfefa92d44e35c;hp=b8f49eec9a03ef94140fdf713b9943059a0c899b;hb=d291d609514dccb254a291e4d0374bde5a3380f3;hpb=d26f555fd84d43b0a3e650c66a0e626e841dd9c6 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..2991931 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include @@ -38,7 +39,6 @@ namespace Toolkit namespace Internal { - /** * @brief A control which renders a short text string. */ @@ -72,6 +72,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. @@ -97,6 +102,16 @@ public: */ Toolkit::TextField::InputStyleChangedSignalType& InputStyleChangedSignal(); + /** + * @brief Called to select the whole texts. + */ + void SelectWholeText(); + + /** + * @brief Called to unselect the whole texts. + */ + void SelectNone(); + private: // From Control /** @@ -191,9 +206,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 @@ -258,6 +273,10 @@ private: // Implementation // Connection needed to re-render text, when a Text Field returns to the stage. void OnStageConnect( Dali::Actor actor ); +public: // For UTC only + + Text::ControllerPtr GetTextController() { return mController; } + private: // Data // Signals @@ -265,7 +284,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 +294,7 @@ private: // Data Actor mRenderableActor; Actor mActiveLayer; + Actor mBackgroundActor; CallbackBase* mIdleCallback; float mAlignmentOffset;