diff options
| author |  fearlessTobi | 2019-09-03 22:53:59 +0200 |
|---|---|---|
| committer | fearlessTobi | 2019-09-03 22:53:59 +0200 |
| commit | 22fd208e8d3c3147f9dbfb3405eede90e025077c (patch) | |
| tree | f56e599409267b1df4808c5ebe4c048e1edf4add /src | |
| parent | Merge pull request #2765 from FernandoS27/dma-fix (diff) | |
| download | yuzu-22fd208e8d3c3147f9dbfb3405eede90e025077c.tar.gz yuzu-22fd208e8d3c3147f9dbfb3405eede90e025077c.tar.xz yuzu-22fd208e8d3c3147f9dbfb3405eede90e025077c.zip | |
Add cancel option to analog stick configuration
Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 7b70f307c..a968cfb5d 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp | |||
| @@ -301,13 +301,16 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 301 | }); | 301 | }); |
| 302 | } | 302 | } |
| 303 | connect(analog_map_stick[analog_id], &QPushButton::clicked, [=] { | 303 | connect(analog_map_stick[analog_id], &QPushButton::clicked, [=] { |
| 304 | QMessageBox::information(this, tr("Information"), | 304 | if (QMessageBox::information( |
| 305 | tr("After pressing OK, first move your joystick horizontally, " | 305 | this, tr("Information"), |
| 306 | "and then vertically.")); | 306 | tr("After pressing OK, first move your joystick horizontally, " |
| 307 | HandleClick( | 307 | "and then vertically."), |
| 308 | analog_map_stick[analog_id], | 308 | QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) { |
| 309 | [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; }, | 309 | HandleClick( |
| 310 | InputCommon::Polling::DeviceType::Analog); | 310 | analog_map_stick[analog_id], |
| 311 | [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; }, | ||
| 312 | InputCommon::Polling::DeviceType::Analog); | ||
| 313 | } | ||
| 311 | }); | 314 | }); |
| 312 | } | 315 | } |
| 313 | 316 | ||