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

Qt: Call 'map_text_to_keycode()' only when Shift modifier is being used

This commit is contained in:
Bobby Smith 2024-10-08 12:45:54 +02:00 committed by Ty
parent 7dd2ebdf49
commit 5845109b75
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcsx2-qt/QtKeyCodes.cpp
View File

@ -566,16 +566,17 @@ const char* InputManager::ConvertHostKeyboardCodeToIcon(u32 code)
u32 QtUtils::KeyEventToCode(const QKeyEvent* ev) u32 QtUtils::KeyEventToCode(const QKeyEvent* ev)
{ {
Qt::KeyboardModifiers modifiers = ev->modifiers();
const QString text = ev->text(); const QString text = ev->text();
const u8 keycode = map_text_to_keycode(text); // Map special text symbols to keycodes // Map special text symbols to keycodes if we're using Shift modifier.
// Also check that we're not using Keypad modifier otherwise "NumpadAsterisk" would return "8" keycode
// and "NumpadPlus" would return "Equal" keycode.
const bool set_keycode = (modifiers & Qt::ShiftModifier) && !(modifiers & Qt::KeypadModifier);
const u8 keycode = set_keycode ? map_text_to_keycode(text) : 0;
int key = ev->key(); int key = ev->key();
if (keycode != 0) if (keycode != 0)
{
key = keycode; // Override key if mapped key = keycode; // Override key if mapped
}
Qt::KeyboardModifiers modifiers = ev->modifiers();
#ifdef __APPLE__ #ifdef __APPLE__
// On macOS, Qt applies the Keypad modifier regardless of whether the arrow keys, or numpad was pressed. // On macOS, Qt applies the Keypad modifier regardless of whether the arrow keys, or numpad was pressed.