X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fevents%2Fkey-event-processor.cpp;h=1bb2f1a87b9d2617eb85946319abe92953084196;hb=53f9fe2ef16f8124ab976c9995146a0fd342775e;hp=92daa9071a5d2d80be6b0a2ac81e260846572910;hpb=0bbbd067294ad02a039d45eac4b8131dde43677c;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/events/key-event-processor.cpp b/dali/internal/event/events/key-event-processor.cpp
index 92daa90..1bb2f1a 100644
--- a/dali/internal/event/events/key-event-processor.cpp
+++ b/dali/internal/event/events/key-event-processor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/events/key-event.h>
 #include <dali/internal/event/events/key-event-impl.h>
-#include <dali/internal/event/actors/actor-impl.h>
-#include <dali/internal/event/common/stage-impl.h>
+#include <dali/internal/event/common/scene-impl.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
 namespace Dali
@@ -31,30 +30,25 @@ namespace Dali
 namespace Internal
 {
 
-KeyEventProcessor::KeyEventProcessor(Stage& stage)
-: mStage(stage)
+KeyEventProcessor::KeyEventProcessor( Scene& scene )
+: mScene( scene )
 {
 }
 
-KeyEventProcessor::~KeyEventProcessor()
-{
-}
+KeyEventProcessor::~KeyEventProcessor() = default;
 
-void KeyEventProcessor::ProcessKeyEvent(const Integration::KeyEvent& event)
+void KeyEventProcessor::ProcessKeyEvent( const Integration::KeyEvent& event )
 {
-  KeyEvent keyEvent(event.keyName, event.keyString, event.keyCode, event.keyModifier, event.time, static_cast<Dali::KeyEvent::State>(event.state));
-
-  GetImplementation( &keyEvent )->SetDeviceName( event.deviceName );
-  GetImplementation( &keyEvent )->SetDeviceClass( event.deviceClass );
-  GetImplementation( &keyEvent )->SetDeviceSubclass( event.deviceSubclass );
-
-  // Emit the key event signal from stage.
-  bool consumed = mStage.EmitKeyEventGeneratedSignal( keyEvent );
+  KeyEventPtr keyEvent( new KeyEvent( event.keyName, event.logicalKey, event.keyString, event.keyCode, event.keyModifier, event.time, static_cast<Dali::KeyEvent::State>( event.state ), event.compose, event.deviceName, event.deviceClass, event.deviceSubclass ) );
+  Dali::KeyEvent keyEventHandle( keyEvent.Get() );
 
+  // Emit the key event signal from the scene.
+  bool consumed = mScene.EmitKeyEventGeneratedSignal( keyEventHandle );
   if( !consumed )
   {
-    mStage.EmitKeyEventSignal(keyEvent);
+    mScene.EmitKeyEventSignal( keyEventHandle );
   }
+
 }
 
 } // namespace Internal