purgatory/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4809 from Morph1984/mjolnir-p3

Browse Source 
configure_input_player: Fix modifier buttons
This commit is contained in:
LC 2020-10-20 15:00:06 -04:00 committed by GitHub
commit ea8345cdcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input_common/settings.h
View File

@ -331,8 +331,6 @@ struct PlayerInput {
ButtonsRaw buttons; ButtonsRaw buttons;
AnalogsRaw analogs; AnalogsRaw analogs;
MotionRaw motions; MotionRaw motions;
std::string lstick_mod;
std::string rstick_mod;
u32 body_color_left; u32 body_color_left;
u32 body_color_right; u32 body_color_right;

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

@ -256,11 +256,6 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
ui->buttonSL, ui->buttonSR, ui->buttonHome, ui->buttonScreenshot, ui->buttonSL, ui->buttonSR, ui->buttonHome, ui->buttonScreenshot,
}; };
mod_buttons = {
ui->buttonLStickMod,
ui->buttonRStickMod,
};
analog_map_buttons = {{ analog_map_buttons = {{
{ {
ui->buttonLStickUp, ui->buttonLStickUp,
@ -284,6 +279,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
analog_map_deadzone_label = {ui->labelLStickDeadzone, ui->labelRStickDeadzone}; analog_map_deadzone_label = {ui->labelLStickDeadzone, ui->labelRStickDeadzone};
analog_map_deadzone_slider = {ui->sliderLStickDeadzone, ui->sliderRStickDeadzone}; analog_map_deadzone_slider = {ui->sliderLStickDeadzone, ui->sliderRStickDeadzone};
analog_map_modifier_groupbox = {ui->buttonLStickModGroup, ui->buttonRStickModGroup}; analog_map_modifier_groupbox = {ui->buttonLStickModGroup, ui->buttonRStickModGroup};
analog_map_modifier_button = {ui->buttonLStickMod, ui->buttonRStickMod};
analog_map_modifier_label = {ui->labelLStickModifierRange, ui->labelRStickModifierRange}; analog_map_modifier_label = {ui->labelLStickModifierRange, ui->labelRStickModifierRange};
analog_map_modifier_slider = {ui->sliderLStickModifierRange, ui->sliderRStickModifierRange}; analog_map_modifier_slider = {ui->sliderLStickModifierRange, ui->sliderRStickModifierRange};
analog_map_range_groupbox = {ui->buttonLStickRangeGroup, ui->buttonRStickRangeGroup}; analog_map_range_groupbox = {ui->buttonLStickRangeGroup, ui->buttonRStickRangeGroup};
@ -394,20 +390,26 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
} }
// Handle clicks for the modifier buttons as well. // Handle clicks for the modifier buttons as well.
ConfigureButtonClick(mod_buttons[analog_id], &stick_mod_param[analog_id], connect(analog_map_modifier_button[analog_id], &QPushButton::clicked, [=, this] {
Config::default_stick_mod[analog_id], HandleClick(
analog_map_modifier_button[analog_id],
[=, this](const Common::ParamPackage& params) {
analogs_param[analog_id].Set("modifier", params.Serialize());
},
InputCommon::Polling::DeviceType::Button); InputCommon::Polling::DeviceType::Button);
});
mod_buttons[analog_id]->setContextMenuPolicy(Qt::CustomContextMenu); analog_map_modifier_button[analog_id]->setContextMenuPolicy(Qt::CustomContextMenu);
connect(mod_buttons[analog_id], &QPushButton::customContextMenuRequested, connect(analog_map_modifier_button[analog_id], &QPushButton::customContextMenuRequested,
[=, this](const QPoint& menu_location) { [=, this](const QPoint& menu_location) {
QMenu context_menu; QMenu context_menu;
context_menu.addAction(tr("Clear"), [&] { context_menu.addAction(tr("Clear"), [&] {
stick_mod_param[analog_id].Clear(); analogs_param[analog_id].Set("modifier", "");
mod_buttons[analog_id]->setText(tr("[not set]")); analog_map_modifier_button[analog_id]->setText(tr("[not set]"));
}); });
context_menu.exec(mod_buttons[analog_id]->mapToGlobal(menu_location)); context_menu.exec(
analog_map_modifier_button[analog_id]->mapToGlobal(menu_location));
}); });
connect(analog_map_range_spinbox[analog_id], qOverload<int>(&QSpinBox::valueChanged), connect(analog_map_range_spinbox[analog_id], qOverload<int>(&QSpinBox::valueChanged),
@ -636,8 +638,8 @@ void ConfigureInputPlayer::RestoreDefaults() {
SetAnalogParam(params, analogs_param[analog_id], analog_sub_buttons[sub_button_id]); SetAnalogParam(params, analogs_param[analog_id], analog_sub_buttons[sub_button_id]);
} }
stick_mod_param[analog_id] = Common::ParamPackage( analogs_param[analog_id].Set(
InputCommon::GenerateKeyboardParam(Config::default_stick_mod[analog_id])); "modifier", InputCommon::GenerateKeyboardParam(Config::default_stick_mod[analog_id]));
} }
for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) { for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) {
@ -669,8 +671,6 @@ void ConfigureInputPlayer::ClearAll() {
analogs_param[analog_id].Clear(); analogs_param[analog_id].Clear();
} }
stick_mod_param[analog_id].Clear();
} }
for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) { for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) {
@ -707,7 +707,8 @@ void ConfigureInputPlayer::UpdateUI() {
AnalogToText(analogs_param[analog_id], analog_sub_buttons[sub_button_id])); AnalogToText(analogs_param[analog_id], analog_sub_buttons[sub_button_id]));
} }
mod_buttons[analog_id]->setText(ButtonToText(stick_mod_param[analog_id])); analog_map_modifier_button[analog_id]->setText(
ButtonToText(Common::ParamPackage{analogs_param[analog_id].Get("modifier", "")}));
const auto deadzone_label = analog_map_deadzone_label[analog_id]; const auto deadzone_label = analog_map_deadzone_label[analog_id];
const auto deadzone_slider = analog_map_deadzone_slider[analog_id]; const auto deadzone_slider = analog_map_deadzone_slider[analog_id];

9
src/yuzu/configuration/configure_input_player.h
View File

@ -131,26 +131,25 @@ private:
std::array<Common::ParamPackage, Settings::NativeButton::NumButtons> buttons_param; std::array<Common::ParamPackage, Settings::NativeButton::NumButtons> buttons_param;
std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> analogs_param; std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> analogs_param;
std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> stick_mod_param;
std::array<Common::ParamPackage, Settings::NativeMotion::NumMotions> motions_param; std::array<Common::ParamPackage, Settings::NativeMotion::NumMotions> motions_param;
static constexpr int ANALOG_SUB_BUTTONS_NUM = 4; static constexpr int ANALOG_SUB_BUTTONS_NUM = 4;
/// Each button input is represented by a QPushButton. /// Each button input is represented by a QPushButton.
std::array<QPushButton*, Settings::NativeButton::NumButtons> button_map; std::array<QPushButton*, Settings::NativeButton::NumButtons> button_map;
/// Each motion input is represented by a QPushButton.
std::array<QPushButton*, Settings::NativeMotion::NumMotions> motion_map;
/// Extra buttons for the modifiers.
std::array<QPushButton*, Settings::NativeAnalog::NumAnalogs> mod_buttons;
/// A group of four QPushButtons represent one analog input. The buttons each represent up, /// A group of four QPushButtons represent one analog input. The buttons each represent up,
/// down, left, right, respectively. /// down, left, right, respectively.
std::array<std::array<QPushButton*, ANALOG_SUB_BUTTONS_NUM>, Settings::NativeAnalog::NumAnalogs> std::array<std::array<QPushButton*, ANALOG_SUB_BUTTONS_NUM>, Settings::NativeAnalog::NumAnalogs>
analog_map_buttons; analog_map_buttons;
/// Each motion input is represented by a QPushButton.
std::array<QPushButton*, Settings::NativeMotion::NumMotions> motion_map;
std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_label; std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_label;
std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_slider; std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_slider;
std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_groupbox; std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_groupbox;
std::array<QPushButton*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_button;
std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_label; std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_label;
std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_slider; std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_slider;
std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_range_groupbox; std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_range_groupbox;