From 11d363535d9c551f08f2c1434faddd2e36285600 Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Thu, 28 Sep 2017 13:33:22 +0900 Subject: [PATCH] Revert "[4.0] Fix to get the full input text in RetrieveSurrounding" This reverts commit e120754c2ddbc72f222221c2441a8a14411eeb11. Change-Id: I5996a708730b226a086daeb13a8aa18fc4fdf0ad --- 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 d31c68a..e566ab9 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