Merge remote-tracking branch 'origin/master' into typos3

2024-01-16 00:09:00 +00:00
parent 6531ad56a6 c683ec2bcb
commit 90ab89a0b0
144 changed files with 5036 additions and 1334 deletions
--- a/src/yuzu/configuration/configure_input_player_widget.cpp
+++ b/src/yuzu/configuration/configure_input_player_widget.cpp
@ -244,7 +244,7 @@ void PlayerControlPreview::paintEvent(QPaintEvent* event) {
    case Core::HID::NpadStyleIndex::GameCube:
        DrawGCController(p, center);
        break;
-    case Core::HID::NpadStyleIndex::ProController:
+    case Core::HID::NpadStyleIndex::Fullkey:
    default:
        DrawProController(p, center);
        break;