diff options
| author | bunnei <bunneidev@gmail.com> | 2022-05-03 14:36:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 14:36:39 -0700 |
| commit | b06f9f2606b7e2965d17e9df4b9a738b425b3cd8 (patch) | |
| tree | 6d4565f25984a5325cc2c13c69600daf44452b31 /src/yuzu/configuration/configure_input_player.cpp | |
| parent | 8037f2eae80be05fb8af177854b6606fb50936c8 (diff) | |
| parent | 17ce54d7f2ce8e1ad68ec36a6ec827f564f60818 (diff) | |
Merge pull request #8272 from german77/stick_range
yuzu: config: Improve analog stick mapping
Diffstat (limited to 'src/yuzu/configuration/configure_input_player.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index b4f5d172a..1c05dd0f3 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -520,7 +520,28 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i QMenu context_menu; Common::ParamPackage param = emulated_controller->GetStickParam(analog_id); context_menu.addAction(tr("Clear"), [&] { - emulated_controller->SetStickParam(analog_id, {}); + if (param.Get("engine", "") != "analog_from_button") { + emulated_controller->SetStickParam(analog_id, {}); + for (auto button : analog_map_buttons[analog_id]) { + button->setText(tr("[not set]")); + } + return; + } + switch (sub_button_id) { + case 0: + param.Erase("up"); + break; + case 1: + param.Erase("down"); + break; + case 2: + param.Erase("left"); + break; + case 3: + param.Erase("right"); + break; + } + emulated_controller->SetStickParam(analog_id, param); analog_map_buttons[analog_id][sub_button_id]->setText(tr("[not set]")); }); context_menu.addAction(tr("Center axis"), [&] { @@ -988,7 +1009,7 @@ void ConfigureInputPlayer::UpdateUI() { slider_value = static_cast<int>(param.Get("deadzone", 0.15f) * 100); deadzone_label->setText(tr("Deadzone: %1%").arg(slider_value)); deadzone_slider->setValue(slider_value); - range_spinbox->setValue(static_cast<int>(param.Get("range", 1.0f) * 100)); + range_spinbox->setValue(static_cast<int>(param.Get("range", 0.95f) * 100)); } else { slider_value = static_cast<int>(param.Get("modifier_scale", 0.5f) * 100); modifier_label->setText(tr("Modifier Range: %1%").arg(slider_value)); |