godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9885 from bruvzg/2.1-win-num-enter-fix 

Fix Numpad Enter key on Windows (2.1)
This commit is contained in:
Rémi Verschelde 2017-07-31 22:59:32 +02:00 committed by GitHub
parent c2fd0e65f7 673211a692
commit bba0be7967
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/windows/os_windows.cpp
View File

@ -809,7 +809,13 @@ void OS_Windows::process_key_events() {
k.mod = ke.mod_state; k.mod = ke.mod_state;
k.pressed = (ke.uMsg == WM_KEYDOWN); k.pressed = (ke.uMsg == WM_KEYDOWN);
k.scancode = KeyMappingWindows::get_keysym(ke.wParam); if ((ke.lParam & (1 << 24)) && (ke.wParam == VK_RETURN)) {
// Special case for Numpad Enter key
k.scancode = KEY_ENTER;
} else {
k.scancode = KeyMappingWindows::get_keysym(ke.wParam);
}
if (i + 1 < key_event_pos && key_event_buffer[i + 1].uMsg == WM_CHAR) if (i + 1 < key_event_pos && key_event_buffer[i + 1].uMsg == WM_CHAR)
k.unicode = key_event_buffer[i + 1].wParam; k.unicode = key_event_buffer[i + 1].wParam;
if (k.unicode && gr_mem) { if (k.unicode && gr_mem) {