diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 8c5921eb6..698cb1940 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp | |||
| @@ -290,7 +290,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 290 | analog_map_range_spinbox = {ui->spinboxLStickRange, ui->spinboxRStickRange}; | 290 | analog_map_range_spinbox = {ui->spinboxLStickRange, ui->spinboxRStickRange}; |
| 291 | 291 | ||
| 292 | const auto ConfigureButtonClick = [&](QPushButton* button, Common::ParamPackage* param, | 292 | const auto ConfigureButtonClick = [&](QPushButton* button, Common::ParamPackage* param, |
| 293 | int default_val) { | 293 | int default_val, InputCommon::Polling::DeviceType type) { |
| 294 | connect(button, &QPushButton::clicked, [=, this] { | 294 | connect(button, &QPushButton::clicked, [=, this] { |
| 295 | HandleClick( | 295 | HandleClick( |
| 296 | button, | 296 | button, |
| @@ -310,7 +310,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 310 | } | 310 | } |
| 311 | *param = std::move(params); | 311 | *param = std::move(params); |
| 312 | }, | 312 | }, |
| 313 | InputCommon::Polling::DeviceType::Button); | 313 | type); |
| 314 | }); | 314 | }); |
| 315 | }; | 315 | }; |
| 316 | 316 | ||
| @@ -322,7 +322,8 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | ConfigureButtonClick(button_map[button_id], &buttons_param[button_id], | 324 | ConfigureButtonClick(button_map[button_id], &buttons_param[button_id], |
| 325 | Config::default_buttons[button_id]); | 325 | Config::default_buttons[button_id], |
| 326 | InputCommon::Polling::DeviceType::Button); | ||
| 326 | 327 | ||
| 327 | button->setContextMenuPolicy(Qt::CustomContextMenu); | 328 | button->setContextMenuPolicy(Qt::CustomContextMenu); |
| 328 | 329 | ||
| @@ -344,7 +345,8 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 344 | } | 345 | } |
| 345 | 346 | ||
| 346 | ConfigureButtonClick(motion_map[motion_id], &motions_param[motion_id], | 347 | ConfigureButtonClick(motion_map[motion_id], &motions_param[motion_id], |
| 347 | Config::default_motions[motion_id]); | 348 | Config::default_motions[motion_id], |
| 349 | InputCommon::Polling::DeviceType::Motion); | ||
| 348 | 350 | ||
| 349 | button->setContextMenuPolicy(Qt::CustomContextMenu); | 351 | button->setContextMenuPolicy(Qt::CustomContextMenu); |
| 350 | 352 | ||
| @@ -393,7 +395,8 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 393 | 395 | ||
| 394 | // Handle clicks for the modifier buttons as well. | 396 | // Handle clicks for the modifier buttons as well. |
| 395 | ConfigureButtonClick(mod_buttons[analog_id], &stick_mod_param[analog_id], | 397 | ConfigureButtonClick(mod_buttons[analog_id], &stick_mod_param[analog_id], |
| 396 | Config::default_stick_mod[analog_id]); | 398 | Config::default_stick_mod[analog_id], |
| 399 | InputCommon::Polling::DeviceType::Button); | ||
| 397 | 400 | ||
| 398 | mod_buttons[analog_id]->setContextMenuPolicy(Qt::CustomContextMenu); | 401 | mod_buttons[analog_id]->setContextMenuPolicy(Qt::CustomContextMenu); |
| 399 | 402 | ||