Modify to get the encoded offset in UTF8

[platform/core/uifw/dali-adaptor.git] / dali / internal / input / windows / input-method-context-impl-win.cpp

diff --git a/dali/internal/input/windows/input-method-context-impl-win.cpp b/dali/internal/input/windows/input-method-context-impl-win.cpp
index 1c3a5a0..b673e4b 100755 (executable)
--- a/dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/dali/internal/input/windows/input-method-context-impl-win.cpp
@@ -25,7 +25,7 @@
 \r
 // INTERNAL INCLUDES\r
 #include <dali/public-api/adaptor-framework/key.h>\r
-#include <dali/integration-api/adaptors/adaptor.h>\r
+#include <dali/integration-api/adaptor-framework/adaptor.h>\r
 #include <dali/internal/adaptor/common/adaptor-impl.h>\r
 #include <dali/internal/input/common/key-impl.h>\r
 #include <dali/internal/input/common/virtual-keyboard-impl.h>\r
@@ -41,6 +41,13 @@ namespace Internal
 namespace Adaptor\r
 {\r
 \r
+namespace\r
+{\r
+#if defined(DEBUG_ENABLED)\r
+Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_INPUT_METHOD_CONTEXT" );\r
+#endif\r
+}\r
+\r
 InputMethodContextPtr InputMethodContextWin::New( Dali::Actor actor )\r
 {\r
   InputMethodContextPtr manager;\r
@@ -62,8 +69,7 @@ InputMethodContextWin::InputMethodContextWin( Dali::Actor actor )
   mIMFCursorPosition( 0 ),\r
   mSurroundingText(),\r
   mRestoreAfterFocusLost( false ),\r
-  mIdleCallbackConnected( false ),\r
-  mPreeditType( Dali::InputMethodContext::PreeditStyle::NONE )\r
+  mIdleCallbackConnected( false )\r
 {\r
 \r
   actor.OnStageSignal().Connect( this, &InputMethodContextWin::OnStaged );\r
@@ -365,10 +371,10 @@ void InputMethodContextWin::SetInputPanelPosition( unsigned int x, unsigned int
   DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::SetInputPanelPosition\n" );\r
 }\r
 \r
-Dali::InputMethodContext::PreeditStyle InputMethodContextWin::GetPreeditStyle() const\r
+void InputMethodContextWin::GetPreeditStyle( Dali::InputMethodContext::PreEditAttributeDataContainer& attrs ) const\r
 {\r
   DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::GetPreeditStyle\n" );\r
-  return mPreeditType;\r
+  attrs = mPreeditAttrs;\r
 }\r
 \r
 bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent )\r