FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix not checking num lock state when remapping keypad keys on Windows.

Browse Source 
Num lock state was never checked during remapping keypad keys on Windows.
Now when num lock is active, keypad numeric keys and keypad delimeter key
should work as expected (return KEY_KP_0 to KEY_KP_9 and KEY_KP_Decimal
respectivly).
This commit is contained in:
Alexey Galitsyn 2019-05-30 23:10:27 +03:00 committed by Robert Osfield
parent fe9c235806
commit 00e2930fb7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgViewer/GraphicsWindowWin32.cpp
View File

@ -688,6 +688,16 @@ class Win32KeyboardMap
static Win32KeyboardMap s_win32KeyboardMap; static Win32KeyboardMap s_win32KeyboardMap;
static int remapWin32Key(int key) static int remapWin32Key(int key)
{ {
bool numlockIsActive = static_cast<bool>(GetKeyState(VK_NUMLOCK) & 0x1);
if (numlockIsActive)
{
if (key >= VK_NUMPAD0 && key <= VK_NUMPAD9)
return key - VK_NUMPAD0 + osgGA::GUIEventAdapter::KEY_KP_0;
if (key == VK_DECIMAL)
return osgGA::GUIEventAdapter::KEY_KP_Decimal;
}
return s_win32KeyboardMap.remapKey(key); return s_win32KeyboardMap.remapKey(key);
} }