From 0a40c50167ec9ef1358eb4b0b35e9677b4189995 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 7 Sep 2020 14:39:03 +0900 Subject: [PATCH] Revert "Revert "Fix build errors for MS-Windows after KeyEvent class pimpling patch."" This reverts commit 066affb40c3fe175062c09ceace4c5792a250d5a. --- dali/internal/input/windows/input-method-context-impl-win.cpp | 8 ++++---- dali/internal/input/windows/input-method-context-impl-win.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 b15c0dd..4accb32 100755 --- a/dali/internal/input/windows/input-method-context-impl-win.cpp +++ b/dali/internal/input/windows/input-method-context-impl-win.cpp @@ -342,11 +342,11 @@ bool InputMethodContextWin::FilterEventKey( const Dali::KeyEvent& keyEvent ) if ( ! KeyLookup::IsDeviceButton( keyEvent.GetKeyName().c_str() )) { //check whether it's key down or key up event - if ( keyEvent.state == Dali::KeyEvent::Down ) + if ( keyEvent.GetState() == Dali::KeyEvent::Down ) { eventHandled = ProcessEventKeyDown( keyEvent ); } - else if ( keyEvent.state == Dali::KeyEvent::Up ) + else if ( keyEvent.GetState() == Dali::KeyEvent::Up ) { eventHandled = ProcessEventKeyUp( keyEvent ); } @@ -377,13 +377,13 @@ void InputMethodContextWin::GetPreeditStyle( Dali::InputMethodContext::PreEditAt attrs = mPreeditAttrs; } -bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent ) +bool InputMethodContextWin::ProcessEventKeyDown( const Dali::KeyEvent& keyEvent ) { bool eventHandled( false ); return eventHandled; } -bool InputMethodContextWin::ProcessEventKeyUp( const KeyEvent& keyEvent ) +bool InputMethodContextWin::ProcessEventKeyUp( const Dali::KeyEvent& keyEvent ) { bool eventHandled( false ); return eventHandled; diff --git a/dali/internal/input/windows/input-method-context-impl-win.h b/dali/internal/input/windows/input-method-context-impl-win.h index 253bc02..58b91b3 100755 --- a/dali/internal/input/windows/input-method-context-impl-win.h +++ b/dali/internal/input/windows/input-method-context-impl-win.h @@ -281,7 +281,7 @@ private: * @param[in] keyEvent The event key to be handled. * @return Whether the event key is handled. */ - bool ProcessEventKeyDown( const KeyEvent& keyEvent ); + bool ProcessEventKeyDown( const Dali::KeyEvent& keyEvent ); /** * @brief Process event key up, whether filter a key to isf. @@ -289,7 +289,7 @@ private: * @param[in] keyEvent The event key to be handled. * @return Whether the event key is handled. */ - bool ProcessEventKeyUp( const KeyEvent& keyEvent ); + bool ProcessEventKeyUp( const Dali::KeyEvent& keyEvent ); /** * Called when the binded actor is added to a window. -- 2.7.4