Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 03:18:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

stupid 1

Browse source
This commit is contained in:
lizzie 2026-03-18 00:39:44 +00:00 • committed by crueter
parent 1666722849
commit fe4cb3318b
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/yuzu/configuration/configure_input_player.cpp
View file

@ -187,7 +187,7 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) {
const QString inverted = QString::fromStdString(param.Get("inverted", false) ? "!" : "");
const QString invert = QString::fromStdString(param.Get("invert", "+") == "-" ? "-" : "");
const QString turbo = QString::fromStdString(param.Get("turbo", false) ? "$" : "");
const auto common_button_name = input_subsystem->GetInputButtonName(param);
const auto common_button_name = input_subsystem->GetButtonName(param);
// Retrieve the names from Qt
if (param.Get("engine", "") == "keyboard") {

6
src/yuzu/configuration/configure_ringcon.cpp
View file

@ -99,7 +99,7 @@ QString GetRingconButtonName(Common::Input::ButtonNames button_name) {
}
}
void SetAnalogParam(const Common::ParamPackage& input_param, Common::ParamPackage& analog_param,
void SetRingconAnalogParam(const Common::ParamPackage& input_param, Common::ParamPackage& analog_param,
const std::string& button_name) {
// The poller returned a complete axis, so set all the buttons
if (input_param.Has("axis_x") && input_param.Has("axis_y")) {
@ -156,7 +156,7 @@ ConfigureRingController::ConfigureRingController(QWidget* parent,
analog_map_buttons[sub_button_id],
[=, this](const Common::ParamPackage& params) {
Common::ParamPackage param = emulated_controller->GetRingParam();
SetAnalogParam(params, param, analog_sub_buttons[sub_button_id]);
SetRingconAnalogParam(params, param, analog_sub_buttons[sub_button_id]);
emulated_controller->SetRingParam(param);
},
InputCommon::Polling::InputType::Stick);
@ -397,7 +397,7 @@ QString ConfigureRingController::ButtonToText(const Common::ParamPackage& param)
const QString toggle = QString::fromStdString(param.Get("toggle", false) ? "~" : "");
const QString inverted = QString::fromStdString(param.Get("inverted", false) ? "!" : "");
const auto common_button_name = input_subsystem->GetRingconButtonName(param);
const auto common_button_name = input_subsystem->GetButtonName(param);
// Retrieve the names from Qt
if (param.Get("engine", "") == "keyboard") {