mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-11-24 13:02:48 +00:00
Merge pull request #4911 from vitor-k/master
Add a cancel option to analog stick configuration
This commit is contained in:
commit
05a07f944b
|
@ -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);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue