From 246375af67bd61bacd793bb4b0fd9a8dd4cabff5 Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Wed, 11 Oct 2017 17:45:52 +0900 Subject: [PATCH] Revert "[4.0] Fix to get the full input text in RetrieveSurrounding" This reverts commit 1335197937e96d6b0146ed8c2864128934ae4ca9. Change-Id: I0720813c47915166c7ce3e6e5dae341641c8bb04 --- 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