H3cJP/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2830 from FearlessTobi/port-4911

Browse Source 
Port citra-emu/citra#4911: "Add cancel option to analog stick configuration"
This commit is contained in:
David 2019-09-05 09:53:44 +10:00 committed by GitHub
commit a956d0b0eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/yuzu/configuration/configure_input_player.cpp
View File

@ -301,13 +301,16 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
}); });
} }
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( HandleClick(
analog_map_stick[analog_id], analog_map_stick[analog_id],
[=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; }, [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; },
InputCommon::Polling::DeviceType::Analog); InputCommon::Polling::DeviceType::Analog);
}
}); });
} }