VERY experimental Nintendo Switch 2 emulator
C++
yuzu: Update controller colors and button names
Narr the Reg2b87d9e6748e
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cppindex c40d980c9a..4b7e3b01bf 100644--- a/src/yuzu/configuration/configure_input_player.cpp+++ b/src/yuzu/configuration/configure_input_player.cpp@@ -66,6 +66,18 @@ QString GetButtonName(Common::Input::ButtonNames button_name) {return QObject::tr("R");case Common::Input::ButtonNames::TriggerL:return QObject::tr("L");+ case Common::Input::ButtonNames::TriggerZR:+ return QObject::tr("ZR");+ case Common::Input::ButtonNames::TriggerZL:+ return QObject::tr("ZL");+ case Common::Input::ButtonNames::TriggerSR:+ return QObject::tr("SR");+ case Common::Input::ButtonNames::TriggerSL:+ return QObject::tr("SL");+ case Common::Input::ButtonNames::ButtonStickL:+ return QObject::tr("Stick L");+ case Common::Input::ButtonNames::ButtonStickR:+ return QObject::tr("Stick R");case Common::Input::ButtonNames::ButtonA:return QObject::tr("A");case Common::Input::ButtonNames::ButtonB:@@ -76,6 +88,14 @@ QString GetButtonName(Common::Input::ButtonNames button_name) {return QObject::tr("Y");case Common::Input::ButtonNames::ButtonStart:return QObject::tr("Start");+ case Common::Input::ButtonNames::ButtonPlus:+ return QObject::tr("Plus");+ case Common::Input::ButtonNames::ButtonMinus:+ return QObject::tr("Minus");+ case Common::Input::ButtonNames::ButtonHome:+ return QObject::tr("Home");+ case Common::Input::ButtonNames::ButtonCapture:+ return QObject::tr("Capture");case Common::Input::ButtonNames::L1:return QObject::tr("L1");case Common::Input::ButtonNames::L2:diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cppindex 11390fec06..68af6c20c9 100644--- a/src/yuzu/configuration/configure_input_player_widget.cpp+++ b/src/yuzu/configuration/configure_input_player_widget.cpp@@ -103,9 +103,13 @@ void PlayerControlPreview::UpdateColors() {colors.left = colors.primary;colors.right = colors.primary;- // Possible alternative to set colors from settings- // colors.left = QColor(controller->GetColors().left.body);- // colors.right = QColor(controller->GetColors().right.body);++ const auto color_left = controller->GetColorsValues()[0].body;+ const auto color_right = controller->GetColorsValues()[1].body;+ if (color_left != 0 && color_right != 0) {+ colors.left = QColor(color_left);+ colors.right = QColor(color_right);+ }}void PlayerControlPreview::ResetInputs() {