dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-07-10 01:54:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vk_test

Browse Source
This commit is contained in:
Megamouse 2026-07-02 19:55:09 +02:00 committed by GitHub
commit c3a9aa43b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpcs3/Emu/NP/np_notifications.cpp
View File

@ -294,6 +294,7 @@ namespace np
MatchingRoomStatus_to_SceNpMatchingRoomStatus(edata, *update_info, room_status);
np_memory.shrink_allocation(edata.addr(), edata.size());
rpcn_log.notice("Received GUI notification: %s", name);
extra_nps::print_SceNpMatchingRoomStatus(room_status);
switch (notification_type)

8
rpcs3/Input/keyboard_pad_handler.cpp
View File

@ -943,10 +943,10 @@ u32 keyboard_pad_handler::GetKeyCode(const QString& keyName)
if (keyName == "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;
if (keyName == "Num←" || keyName == "←") return Qt::Key_Left;
if (keyName == "Num↑" || keyName == "↑") return Qt::Key_Up;
if (keyName == "Num→" || keyName == "→") return Qt::Key_Right;
if (keyName == "Num↓" || keyName == "↓") return Qt::Key_Down;
#endif
const QKeySequence seq(keyName);