archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

macOS: Fix arrow keys

Browse source
This commit is contained in:
nastys 2022-01-10 14:48:26 +01:00 • committed by Megamouse
parent b950651487
commit ed542b2cb4
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rpcs3/Input/keyboard_pad_handler.cpp
View file

@ -638,6 +638,19 @@ std::string keyboard_pad_handler::GetKeyName(const QKeyEvent* keyEvent)
return "Meta"; return "Meta";
case Qt::Key_NumLock: case Qt::Key_NumLock:
return sstr(QKeySequence(keyEvent->key()).toString(QKeySequence::NativeText)); return sstr(QKeySequence(keyEvent->key()).toString(QKeySequence::NativeText));
#ifdef __APPLE__
// On macOS, the arrow keys are considered to be part of the keypad;
// since most Mac keyboards lack a keypad to begin with,
// we change them to regular arrows to avoid confusion
case Qt::Key_Left:
return "←";
case Qt::Key_Up:
return "↑";
case Qt::Key_Right:
return "→";
case Qt::Key_Down:
return "↓";
#endif
default: default:
break; break;
} }
@ -670,6 +683,17 @@ u32 keyboard_pad_handler::GetKeyCode(const QString& keyName)
return Qt::Key_Control; return Qt::Key_Control;
if (keyName == "Meta") if (keyName == "Meta")
return Qt::Key_Meta; return Qt::Key_Meta;
#ifdef __APPLE__
// QKeySequence doesn't work properly for the arrow keys on macOS
if (keyName == "Num←")
return Qt::Key_Left;
if (keyName == "Num↑")
return Qt::Key_Up;
if (keyName == "Num→")
return Qt::Key_Right;
if (keyName == "Num↓")
return Qt::Key_Down;
#endif
const QKeySequence seq(keyName); const QKeySequence seq(keyName);
u32 key_code = 0; u32 key_code = 0;