Browse Source
Merge pull request #7900 from german77/enter
yuzu: config: Fix mapping issues with the enter key
pull/15/merge
bunnei
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
0 deletions
-
src/yuzu/configuration/configure_input_player.cpp
-
src/yuzu/configuration/configure_touch_from_button.cpp
|
|
|
@ -1332,6 +1332,9 @@ void ConfigureInputPlayer::HandleClick( |
|
|
|
QPushButton* button, std::size_t button_id, |
|
|
|
std::function<void(const Common::ParamPackage&)> new_input_setter, |
|
|
|
InputCommon::Polling::InputType type) { |
|
|
|
if (timeout_timer->isActive()) { |
|
|
|
return; |
|
|
|
} |
|
|
|
if (button == ui->buttonMotionLeft || button == ui->buttonMotionRight) { |
|
|
|
button->setText(tr("Shake!")); |
|
|
|
} else { |
|
|
|
|
|
|
|
@ -227,6 +227,9 @@ void ConfigureTouchFromButton::RenameMapping() { |
|
|
|
} |
|
|
|
|
|
|
|
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]")); |
|
|
|
|
|
|
|
input_setter = [this, row_index, is_new](const Common::ParamPackage& params, |
|
|
|
|