Revert "Revert "KeyEvent class pimpling""

[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 5bd9b6f..b15c0dd 100755 (executable)
--- a/dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/dali/internal/input/windows/input-method-context-impl-win.cpp
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.\r
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -20,17 +20,17 @@
 \r
 // EXTERNAL INCLUDES\r
 #include <dali/public-api/events/key-event.h>\r
-#include <dali/public-api/adaptor-framework/key.h>\r
 #include <dali/public-api/object/type-registry.h>\r
+#include <dali/devel-api/common/singleton-service.h>\r
 #include <dali/integration-api/debug.h>\r
 \r
 // INTERNAL INCLUDES\r
-#include <dali/integration-api/adaptor.h>\r
+#include <dali/public-api/adaptor-framework/key.h>\r
+#include <dali/integration-api/adaptor-framework/adaptor.h>\r
 #include <dali/internal/adaptor/common/adaptor-impl.h>\r
-#include <dali/internal/system/common/locale-utils.h>\r
-#include <dali/internal/system/common/singleton-service-impl.h>\r
-#include <dali/internal/input/common/virtual-keyboard-impl.h>\r
 #include <dali/internal/input/common/key-impl.h>\r
+#include <dali/internal/input/common/virtual-keyboard-impl.h>\r
+#include <dali/internal/system/common/locale-utils.h>\r
 \r
 namespace Dali\r
 {\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
@@ -65,7 +72,7 @@ InputMethodContextWin::InputMethodContextWin( Dali::Actor actor )
   mIdleCallbackConnected( false )\r
 {\r
 \r
-  actor.OnStageSignal().Connect( this, &InputMethodContextWin::OnStaged );\r
+  actor.OnSceneSignal().Connect( this, &InputMethodContextWin::OnStaged );\r
 }\r
 \r
 InputMethodContextWin::~InputMethodContextWin()\r
@@ -332,14 +339,14 @@ bool InputMethodContextWin::FilterEventKey( const Dali::KeyEvent& keyEvent )
 {\r
   bool eventHandled( false );\r
 \r
-  if ( ! KeyLookup::IsDeviceButton( keyEvent.keyPressedName.c_str() ))\r
+  if ( ! KeyLookup::IsDeviceButton( keyEvent.GetKeyName().c_str() ))\r
   {\r
     //check whether it's key down or key up event\r
-    if ( keyEvent.state == KeyEvent::Down )\r
+    if ( keyEvent.state == Dali::KeyEvent::Down )\r
     {\r
       eventHandled = ProcessEventKeyDown( keyEvent );\r
     }\r
-    else if ( keyEvent.state == KeyEvent::Up )\r
+    else if ( keyEvent.state == Dali::KeyEvent::Up )\r
     {\r
       eventHandled = ProcessEventKeyUp( keyEvent );\r
     }\r
@@ -364,6 +371,12 @@ void InputMethodContextWin::SetInputPanelPosition( unsigned int x, unsigned int
   DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::SetInputPanelPosition\n" );\r
 }\r
 \r
+void InputMethodContextWin::GetPreeditStyle( Dali::InputMethodContext::PreEditAttributeDataContainer& attrs ) const\r
+{\r
+  DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::GetPreeditStyle\n" );\r
+  attrs = mPreeditAttrs;\r
+}\r
+\r
 bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent )\r
 {\r
   bool eventHandled( false );\r