aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArisotura <thetotalworm@gmail.com>2020-10-13 13:49:23 +0200
committerGitHub <noreply@github.com>2020-10-13 13:49:23 +0200
commit3a17ae478ecf1e213a61eeb98df895610c5debd7 (patch)
treeb7fdded20506a151d4fca3f20de590c0229e823e
parentf8c4bf6db140f590f2cf781e9da67ed208bd47f5 (diff)
parentdc46da0e24666c67c1780b24e58151d31d8ba34c (diff)
Merge pull request #789 from abcdjdj/numpad-fix
Input : Treat numpad keys as keypresses
-rw-r--r--src/frontend/qt_sdl/Input.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/frontend/qt_sdl/Input.cpp b/src/frontend/qt_sdl/Input.cpp
index 84d20ad..11b64cc 100644
--- a/src/frontend/qt_sdl/Input.cpp
+++ b/src/frontend/qt_sdl/Input.cpp
@@ -98,7 +98,9 @@ int GetEventKeyVal(QKeyEvent* event)
void KeyPress(QKeyEvent* 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++)
if (keyKP == Config::KeyMapping[i])
@@ -112,7 +114,9 @@ void KeyPress(QKeyEvent* event)
void KeyRelease(QKeyEvent* 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++)
if (keyKP == Config::KeyMapping[i])