mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 19:23:22 +02:00
configure_input_player: Fixes motion mapping using ConfigureButtonClick
This commit is contained in:
parent
8568f44ffa
commit
70499b8cbd
@ -290,7 +290,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
|
|||||||
analog_map_range_spinbox = {ui->spinboxLStickRange, ui->spinboxRStickRange};
|
analog_map_range_spinbox = {ui->spinboxLStickRange, ui->spinboxRStickRange};
|
||||||
|
|
||||||
const auto ConfigureButtonClick = [&](QPushButton* button, Common::ParamPackage* param,
|
const auto ConfigureButtonClick = [&](QPushButton* button, Common::ParamPackage* param,
|
||||||
int default_val) {
|
int default_val, InputCommon::Polling::DeviceType type) {
|
||||||
connect(button, &QPushButton::clicked, [=, this] {
|
connect(button, &QPushButton::clicked, [=, this] {
|
||||||
HandleClick(
|
HandleClick(
|
||||||
button,
|
button,
|
||||||
@ -310,7 +310,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
|
|||||||
}
|
}
|
||||||
*param = std::move(params);
|
*param = std::move(params);
|
||||||
},
|
},
|
||||||
InputCommon::Polling::DeviceType::Button);
|
type);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -322,7 +322,8 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
|
|||||||
}
|
}
|
||||||
|
|
||||||
ConfigureButtonClick(button_map[button_id], &buttons_param[button_id],
|
ConfigureButtonClick(button_map[button_id], &buttons_param[button_id],
|
||||||
Config::default_buttons[button_id]);
|
Config::default_buttons[button_id],
|
||||||
|
InputCommon::Polling::DeviceType::Button);
|
||||||
|
|
||||||
button->setContextMenuPolicy(Qt::CustomContextMenu);
|
button->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
|
|
||||||
@ -344,7 +345,8 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
|
|||||||
}
|
}
|
||||||
|
|
||||||
ConfigureButtonClick(motion_map[motion_id], &motions_param[motion_id],
|
ConfigureButtonClick(motion_map[motion_id], &motions_param[motion_id],
|
||||||
Config::default_motions[motion_id]);
|
Config::default_motions[motion_id],
|
||||||
|
InputCommon::Polling::DeviceType::Motion);
|
||||||
|
|
||||||
button->setContextMenuPolicy(Qt::CustomContextMenu);
|
button->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
|
|
||||||
@ -393,7 +395,8 @@ 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],
|
ConfigureButtonClick(mod_buttons[analog_id], &stick_mod_param[analog_id],
|
||||||
Config::default_stick_mod[analog_id]);
|
Config::default_stick_mod[analog_id],
|
||||||
|
InputCommon::Polling::DeviceType::Button);
|
||||||
|
|
||||||
mod_buttons[analog_id]->setContextMenuPolicy(Qt::CustomContextMenu);
|
mod_buttons[analog_id]->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user