midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4911 from vitor-k/master

Browse Source 
Add a cancel option to analog stick configuration
This commit is contained in:
Pengfei Zhu 2019-09-01 21:50:10 +08:00 committed by GitHub
commit 05a07f944b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/citra_qt/configuration/configure_input.cpp
View File

@ -231,9 +231,11 @@ ConfigureInput::ConfigureInput(QWidget* parent)
}); });
} }
connect(analog_map_stick[analog_id], &QPushButton::clicked, [=]() { connect(analog_map_stick[analog_id], &QPushButton::clicked, [=]() {
QMessageBox::information(this, tr("Information"), if (QMessageBox::information(
this, tr("Information"),
tr("After pressing OK, first move your joystick horizontally, " tr("After pressing OK, first move your joystick horizontally, "
"and then vertically.")); "and then vertically."),
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
HandleClick(analog_map_stick[analog_id], HandleClick(analog_map_stick[analog_id],
[=](const Common::ParamPackage& params) { [=](const Common::ParamPackage& params) {
analogs_param[analog_id] = params; analogs_param[analog_id] = params;
@ -241,6 +243,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
Settings::SaveProfile(ui->profile->currentIndex()); Settings::SaveProfile(ui->profile->currentIndex());
}, },
InputCommon::Polling::DeviceType::Analog); InputCommon::Polling::DeviceType::Analog);
}
}); });
} }