summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfearlessTobi <thm.frey@gmail.com>2019-09-03 22:53:59 +0200
committerfearlessTobi <thm.frey@gmail.com>2019-09-03 22:53:59 +0200
commit22fd208e8d3c3147f9dbfb3405eede90e025077c (patch)
treef56e599409267b1df4808c5ebe4c048e1edf4add /src
parent50b5bb44a009dc899d0d7722e50d8976ce4e34f1 (diff)
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.cpp17
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 7b70f307cf..a968cfb5d6 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
});
}
connect(analog_map_stick[analog_id], &QPushButton::clicked, [=] {
- QMessageBox::information(this, tr("Information"),
- tr("After pressing OK, first move your joystick horizontally, "
- "and then vertically."));
- HandleClick(
- analog_map_stick[analog_id],
- [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; },
- InputCommon::Polling::DeviceType::Analog);
+ if (QMessageBox::information(
+ this, tr("Information"),
+ tr("After pressing OK, first move your joystick horizontally, "
+ "and then vertically."),
+ QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
+ HandleClick(
+ analog_map_stick[analog_id],
+ [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; },
+ InputCommon::Polling::DeviceType::Analog);
+ }
});
}