citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4911 from vitor-k/master 

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
parent 1e3f943f6f ac3a854f45
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

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

@ -231,16 +231,19 @@ 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(
tr("After pressing OK, first move your joystick horizontally, " this, tr("Information"),
"and then vertically.")); tr("After pressing OK, first move your joystick horizontally, "
HandleClick(analog_map_stick[analog_id], "and then vertically."),
[=](const Common::ParamPackage& params) { QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
analogs_param[analog_id] = params; HandleClick(analog_map_stick[analog_id],
ApplyConfiguration(); [=](const Common::ParamPackage& params) {
Settings::SaveProfile(ui->profile->currentIndex()); analogs_param[analog_id] = params;
}, ApplyConfiguration();
InputCommon::Polling::DeviceType::Analog); Settings::SaveProfile(ui->profile->currentIndex());
},
InputCommon::Polling::DeviceType::Analog);
}
}); });
} }