ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #789 from abcdjdj/numpad-fix 

Input : Treat numpad keys as keypresses
This commit is contained in:
Arisotura 2020-10-13 13:49:23 +02:00 committed by GitHub
parent f8c4bf6db1 dc46da0e24
commit 3a17ae478e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/qt_sdl/Input.cpp
View File

@ -98,7 +98,9 @@ int GetEventKeyVal(QKeyEvent* event)
void KeyPress(QKeyEvent* event) void KeyPress(QKeyEvent* event)
{ {
int keyHK = GetEventKeyVal(event); int keyHK = GetEventKeyVal(event);
int keyKP = keyHK & ~event->modifiers(); int keyKP = keyHK;
if (event->modifiers() != Qt::KeypadModifier)
keyKP &= ~event->modifiers();
for (int i = 0; i < 12; i++) for (int i = 0; i < 12; i++)
if (keyKP == Config::KeyMapping[i]) if (keyKP == Config::KeyMapping[i])
@ -112,7 +114,9 @@ void KeyPress(QKeyEvent* event)
void KeyRelease(QKeyEvent* event) void KeyRelease(QKeyEvent* event)
{ {
int keyHK = GetEventKeyVal(event); int keyHK = GetEventKeyVal(event);
int keyKP = keyHK & ~event->modifiers(); int keyKP = keyHK;
if (event->modifiers() != Qt::KeypadModifier)
keyKP &= ~event->modifiers();
for (int i = 0; i < 12; i++) for (int i = 0; i < 12; i++)
if (keyKP == Config::KeyMapping[i]) if (keyKP == Config::KeyMapping[i])