From 8c3c2a12c2a46e1752589cf8f8e1bc7ea6c398df Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 16 Oct 2017 11:09:25 +0900 Subject: [PATCH] Revert "[4.0] Fix to get the full input text in RetrieveSurrounding" This reverts commit 5a86921c3fbd5a36aa8ed2f8b7b0cb43223f2bb2. Change-Id: I33dc429e97ad11731c27a5e55bb0e30d92cedfff --- adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp index 69e5e41..f171016 100644 --- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp @@ -589,20 +589,16 @@ Eina_Bool ImfManager::RetrieveSurrounding( void* data, Ecore_IMF_Context* imfCon Dali::ImfManager::ImfEventData imfData( Dali::ImfManager::GETSURROUNDING, std::string(), 0, 0 ); Dali::ImfManager handle( this ); - Dali::ImfManager::ImfCallbackData callbackData = mEventSignal.Emit( handle, imfData ); + mEventSignal.Emit( handle, imfData ); - if( callbackData.update ) + if( text ) { - if( text ) - { - *text = strdup( callbackData.currentText.c_str() ); - } + *text = strdup( mSurroundingText.c_str() ); + } - if( cursorPosition ) - { - mIMFCursorPosition = static_cast( callbackData.cursorPosition ); - *cursorPosition = mIMFCursorPosition; - } + if( cursorPosition ) + { + *cursorPosition = mIMFCursorPosition; } return EINA_TRUE; -- 2.7.4