yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #7900 from german77/enter 

yuzu: config: Fix mapping issues with the enter key
This commit is contained in:
bunnei 2022-02-18 15:47:34 -07:00 committed by GitHub
parent 90a4591563 1e21f5f872
commit 83a84f1c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1332,6 +1332,9 @@ void ConfigureInputPlayer::HandleClick(
QPushButton* button, std::size_t button_id, QPushButton* button, std::size_t button_id,
std::function<void(const Common::ParamPackage&)> new_input_setter, std::function<void(const Common::ParamPackage&)> new_input_setter,
InputCommon::Polling::InputType type) { InputCommon::Polling::InputType type) {
if (timeout_timer->isActive()) {
return;
}
if (button == ui->buttonMotionLeft || button == ui->buttonMotionRight) { if (button == ui->buttonMotionLeft || button == ui->buttonMotionRight) {
button->setText(tr("Shake!")); button->setText(tr("Shake!"));
} else { } else {

3
src/yuzu/configuration/configure_touch_from_button.cpp
View File

@ -227,6 +227,9 @@ void ConfigureTouchFromButton::RenameMapping() {
} }
void ConfigureTouchFromButton::GetButtonInput(const int row_index, const bool is_new) { void ConfigureTouchFromButton::GetButtonInput(const int row_index, const bool is_new) {
if (timeout_timer->isActive()) {
return;
}
binding_list_model->item(row_index, 0)->setText(tr("[press key]")); binding_list_model->item(row_index, 0)->setText(tr("[press key]"));
input_setter = [this, row_index, is_new](const Common::ParamPackage& params, input_setter = [this, row_index, is_new](const Common::ParamPackage& params,