yuzu: Update controller colors and button names
This commit is contained in:
parent
2d802893e7
commit
18c9f8eeed
2 changed files with 27 additions and 3 deletions
|
@ -66,6 +66,18 @@ QString GetButtonName(Common::Input::ButtonNames button_name) {
|
||||||
return QObject::tr("R");
|
return QObject::tr("R");
|
||||||
case Common::Input::ButtonNames::TriggerL:
|
case Common::Input::ButtonNames::TriggerL:
|
||||||
return QObject::tr("L");
|
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:
|
case Common::Input::ButtonNames::ButtonA:
|
||||||
return QObject::tr("A");
|
return QObject::tr("A");
|
||||||
case Common::Input::ButtonNames::ButtonB:
|
case Common::Input::ButtonNames::ButtonB:
|
||||||
|
@ -76,6 +88,14 @@ QString GetButtonName(Common::Input::ButtonNames button_name) {
|
||||||
return QObject::tr("Y");
|
return QObject::tr("Y");
|
||||||
case Common::Input::ButtonNames::ButtonStart:
|
case Common::Input::ButtonNames::ButtonStart:
|
||||||
return QObject::tr("Start");
|
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:
|
case Common::Input::ButtonNames::L1:
|
||||||
return QObject::tr("L1");
|
return QObject::tr("L1");
|
||||||
case Common::Input::ButtonNames::L2:
|
case Common::Input::ButtonNames::L2:
|
||||||
|
|
|
@ -103,9 +103,13 @@ void PlayerControlPreview::UpdateColors() {
|
||||||
|
|
||||||
colors.left = colors.primary;
|
colors.left = colors.primary;
|
||||||
colors.right = colors.primary;
|
colors.right = colors.primary;
|
||||||
// Possible alternative to set colors from settings
|
|
||||||
// colors.left = QColor(controller->GetColors().left.body);
|
const auto color_left = controller->GetColorsValues()[0].body;
|
||||||
// colors.right = QColor(controller->GetColors().right.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() {
|
void PlayerControlPreview::ResetInputs() {
|
||||||
|
|
Loading…
Reference in a new issue