From a42cdbe4c54195dfb4e1ba16b7ed9316349837c2 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Mon, 26 Oct 2020 10:42:52 -0300 Subject: [PATCH] [windows] Return the key name for ascii letters If the key code falls under the ascii range of letters, return the key code as an ascii value. Change-Id: Idb2c990fa484354d146b2769809aa3eb6e36b2c6 --- dali/internal/window-system/windows/platform-implement-win.cpp | 6 +++++- dali/internal/window-system/windows/platform-implement-win.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dali/internal/window-system/windows/platform-implement-win.cpp b/dali/internal/window-system/windows/platform-implement-win.cpp index 3e51425..c56d31e 100755 --- a/dali/internal/window-system/windows/platform-implement-win.cpp +++ b/dali/internal/window-system/windows/platform-implement-win.cpp @@ -279,7 +279,7 @@ void KillTimer(intptr_t id) delete info; } -const char* GetKeyName( int keyCode ) +std::string GetKeyName( int keyCode ) { switch( keyCode ) { @@ -361,6 +361,10 @@ const char* GetKeyName( int keyCode ) } default: { + if (keyCode > 0 && keyCode < 128) + { + return std::string(1u, static_cast(keyCode)); + } break; } } diff --git a/dali/internal/window-system/windows/platform-implement-win.h b/dali/internal/window-system/windows/platform-implement-win.h index 21c19fa..d31099f 100755 --- a/dali/internal/window-system/windows/platform-implement-win.h +++ b/dali/internal/window-system/windows/platform-implement-win.h @@ -20,6 +20,7 @@ // EXTERNAL_HEADERS #include +#include #include typedef uintptr_t WinWindowHandle; @@ -49,7 +50,7 @@ intptr_t SetTimer(int interval, timerCallback callback, void *data); void KillTimer(intptr_t id); -const char* GetKeyName( int keyCode ); +std::string GetKeyName( int keyCode ); uint64_t GetCurrentThreadId(); -- 2.7.4