X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-input-method-context.cpp;h=f316e5096b2d6bdca6121fd35f9cf446f1e2a4ef;hb=dc3bbd29a417e1fbc7f81104c60c5ba90212f216;hp=775c0c0d99a748e7928446304ae47e3dbc20e81b;hpb=e37f48bb34e81585a6ed436bd7a2f9dce02c19f5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp index 775c0c0..f316e50 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp @@ -59,6 +59,8 @@ public: const std::string& GetSurroundingText() const; void ApplyOptions( const InputMethodOptions& options ); bool FilterEventKey( const Dali::KeyEvent& keyEvent ); + void SetPreeditStyle( Dali::InputMethodContext::PreeditStyle type ); + Dali::InputMethodContext::PreeditStyle GetPreeditStyle() const; public: // Signals ActivatedSignalType& ActivatedSignal() { return mActivatedSignal; } @@ -85,6 +87,7 @@ private: bool mRestoreAfterFocusLost:1; ///< Whether the keyboard needs to be restored (activated ) after focus regained. bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected. InputMethodOptions mOptions; + Dali::InputMethodContext::PreeditStyle mPreeditStyle; ActivatedSignalType mActivatedSignal; KeyboardEventSignalType mEventSignal; @@ -125,7 +128,8 @@ InputMethodContext::InputMethodContext( /*Ecore_X_Window ecoreXwin*/ ) : mIMFCursorPosition( 0 ), mSurroundingText(), mRestoreAfterFocusLost( false ), - mIdleCallbackConnected( false ) + mIdleCallbackConnected( false ), + mPreeditStyle( Dali::InputMethodContext::PreeditStyle::NONE ) { CreateContext( /*ecoreXwin*/ ); ConnectCallbacks(); @@ -212,6 +216,16 @@ bool InputMethodContext::FilterEventKey( const Dali::KeyEvent& keyEvent ) { return false; } + +void InputMethodContext::SetPreeditStyle( Dali::InputMethodContext::PreeditStyle type ) +{ + mPreeditStyle = type; +} + +Dali::InputMethodContext::PreeditStyle InputMethodContext::GetPreeditStyle() const +{ + return mPreeditStyle; +} } // Adaptor } // Internal @@ -231,6 +245,11 @@ InputMethodContext::~InputMethodContext() InputMethodContext InputMethodContext::New() { + return InputMethodContext::New( Actor() ); +} + +InputMethodContext InputMethodContext::New( Actor actor ) +{ return Internal::Adaptor::InputMethodContext::New(); } @@ -303,6 +322,17 @@ bool InputMethodContext::FilterEventKey( const Dali::KeyEvent& keyEvent ) return Internal::Adaptor::InputMethodContext::GetImplementation(*this).FilterEventKey( keyEvent ); } +void InputMethodContext::SetPreeditStyle( Dali::InputMethodContext::PreeditStyle type ) +{ + Internal::Adaptor::InputMethodContext::GetImplementation(*this).SetPreeditStyle( type ); +} + +Dali::InputMethodContext::PreeditStyle InputMethodContext::GetPreeditStyle() const +{ + return Internal::Adaptor::InputMethodContext::GetImplementation(*this).GetPreeditStyle(); +} + +// Signals InputMethodContext::ActivatedSignalType& InputMethodContext::ActivatedSignal() { return Internal::Adaptor::InputMethodContext::GetImplementation(*this).ActivatedSignal();