lux/yuzu
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/yuzu.git synced 2024-12-22 10:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4680 from Morph1984/fix-motion-mapping

Browse source 
configure_input_player: Fixes motion mapping using ConfigureButtonClick
This commit is contained in:
David 2020-09-18 21:03:50 +10:00 committed by GitHub
parent 8568f44ffa 70499b8cbd
commit 050a4a401b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -290,7 +290,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
analog_map_range_spinbox = {ui->spinboxLStickRange, ui->spinboxRStickRange};
const auto ConfigureButtonClick = [&](QPushButton* button, Common::ParamPackage* param,
int default_val) {
int default_val, InputCommon::Polling::DeviceType type) {
connect(button, &QPushButton::clicked, [=, this] {
HandleClick(
button,
@ -310,7 +310,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
}
*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],
Config::default_buttons[button_id]);
Config::default_buttons[button_id],
InputCommon::Polling::DeviceType::Button);
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],
Config::default_motions[motion_id]);
Config::default_motions[motion_id],
InputCommon::Polling::DeviceType::Motion);
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.
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);