From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Fri, 22 Sep 2017 07:44:20 +0000 (+0900)
Subject: [4.0] Fix to get the full input text in RetrieveSurrounding
X-Git-Tag: accepted/tizen/4.0/unified/20170925.151055~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e120754c2ddbc72f222221c2441a8a14411eeb11;hp=446b2c3c67f1f0fc76d7109ea9b9ded7d10efe92;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[4.0] Fix to get the full input text in RetrieveSurrounding

- When an IMF retrieve surround event is received,
 DALi should send the current full text to IME.

Change-Id: Ie00c3de120fd80a54c085ee6bfc138545c938175
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---

diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
index e566ab9..d31c68a 100644
--- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
@@ -589,16 +589,20 @@ 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 );
-  mEventSignal.Emit( handle, imfData );
+  Dali::ImfManager::ImfCallbackData callbackData = mEventSignal.Emit( handle, imfData );
 
-  if( text )
+  if( callbackData.update )
   {
-    *text = strdup( mSurroundingText.c_str() );
-  }
+    if( text )
+    {
+      *text = strdup( callbackData.currentText.c_str() );
+    }
 
-  if( cursorPosition )
-  {
-    *cursorPosition = mIMFCursorPosition;
+    if( cursorPosition )
+    {
+      mIMFCursorPosition = static_cast<int>( callbackData.cursorPosition );
+      *cursorPosition = mIMFCursorPosition;
+    }
   }
 
   return EINA_TRUE;