X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fevents%2Fkey-event-processor.cpp;h=e72adc30b0ca5453249a7caef4fcf946a1908471;hb=e5f24bbdefd82ab32d7530dc44ffc321e5b42d17;hp=92daa9071a5d2d80be6b0a2ac81e260846572910;hpb=a934e6dd80ae58faa43bb8c19bc9a0f50c38738b;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 old mode 100644 new mode 100755 index 92daa90..e72adc3 --- 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 #include -#include -#include +#include #include namespace Dali @@ -31,8 +30,8 @@ namespace Dali namespace Internal { -KeyEventProcessor::KeyEventProcessor(Stage& stage) -: mStage(stage) +KeyEventProcessor::KeyEventProcessor( Scene& scene ) +: mScene( scene ) { } @@ -40,21 +39,18 @@ KeyEventProcessor::~KeyEventProcessor() { } -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(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( 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