INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-15 11:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add range slider for analog sticks

Browse Source
This commit is contained in:
Ameer
2020-07-13 11:58:40 -04:00
committed by ameerj
parent acfd771e79
commit ed51c2abda
4 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/yuzu/configuration/configure_input_player.cpp
View File

@ -272,6 +272,8 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
ui->sliderRStickDeadzoneAndModifier};
analog_map_deadzone_and_modifier_slider_label = {ui->labelLStickDeadzoneAndModifier,
ui->labelRStickDeadzoneAndModifier};
analog_map_range_slider = {ui->sliderLStickRange, ui->sliderRStickRange};
analog_map_range_slider_label = {ui->labelLStickRange, ui->labelRStickRange};
for (int button_id = 0; button_id < Settings::NativeButton::NumButtons; button_id++) {
auto* const button = button_map[button_id];
@ -364,7 +366,6 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
InputCommon::Polling::DeviceType::Analog);
}
});
connect(analog_map_deadzone_and_modifier_slider[analog_id], &QSlider::valueChanged,
[=, this] {
const float slider_value =
@ -380,6 +381,15 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
analogs_param[analog_id].Set("modifier_scale", slider_value / 100.0f);
}
});
connect(analog_map_range_slider[analog_id], &QSlider::valueChanged, [=, this] {
const float slider_value = analog_map_range_slider[analog_id]->value();
const auto engine = analogs_param[analog_id].Get("engine", "");
if (engine == "sdl" || engine == "gcpad") {
analog_map_range_slider_label[analog_id]->setText(
tr("Range: %1%").arg(slider_value + 50.0f));
analogs_param[analog_id].Set("range", slider_value / 100.0f);
}
});
}
connect(ui->buttonClearAll, &QPushButton::clicked, [this] { ClearAll(); });
@ -585,6 +595,9 @@ void ConfigureInputPlayer::UpdateButtonLabels() {
auto* const analog_stick_slider_label =
analog_map_deadzone_and_modifier_slider_label[analog_id];
auto* const analog_stick_range = analog_map_range_slider[analog_id];
auto* const analog_stick_range_label = analog_map_range_slider_label[analog_id];
if (param.Has("engine")) {
if (param.Get("engine", "") == "sdl" || param.Get("engine", "") == "gcpad") {
if (!param.Has("deadzone")) {
@ -595,6 +608,14 @@ void ConfigureInputPlayer::UpdateButtonLabels() {
if (analog_stick_slider->value() == 0) {
analog_stick_slider_label->setText(tr("Deadzone: 0%"));
}
if (!param.Has("range")) {
param.Set("range", 0.50f);
}
analog_stick_range->setValue(static_cast<int>(param.Get("range", 0.1f) * 100));
if (analog_stick_range->value() == 0) {
analog_stick_range_label->setText(tr("Range: 0%"));
}
} else {
if (!param.Has("modifier_scale")) {
param.Set("modifier_scale", 0.5f);