diff --git a/src/duckstation-qt/qtkeycodes.cpp b/src/duckstation-qt/qtkeycodes.cpp index cdcf0b161..7c09bdc80 100644 --- a/src/duckstation-qt/qtkeycodes.cpp +++ b/src/duckstation-qt/qtkeycodes.cpp @@ -517,5 +517,22 @@ const char* InputManager::ConvertHostKeyboardCodeToIcon(u32 code) u32 QtUtils::KeyEventToCode(const QKeyEvent* ev) { - return static_cast(ev->key()) | (static_cast(ev->modifiers()) & static_cast(Qt::KeypadModifier)); + int key = ev->key(); + Qt::KeyboardModifiers modifiers = ev->modifiers(); + +#ifdef __APPLE__ + // On macOS, Qt applies the Keypad modifier regardless of whether the arrow keys, or numpad was pressed. + // The only way to differentiate between the keypad and the arrow keys is by the text. + // Hopefully some keyboard layouts don't change the numpad positioning... + if (modifiers & Qt::KeypadModifier && key >= Qt::Key_Insert && key <= Qt::Key_PageDown) + { + if (ev->text().isEmpty()) + { + // Drop the modifier, because it's probably not actually a numpad push. + modifiers &= ~Qt::KeypadModifier; + } + } +#endif + + return static_cast(key) | (static_cast(modifiers) & static_cast(Qt::KeypadModifier)); }