INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-14 11:07:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure_input: Hook up the motion button and checkbox

Browse Source 
This allows toggling motion on or off, and allows access to the motion configuration.
Also changes the [waiting] text for motion buttons to Shake! as this is how motion is connected to a player.
This commit is contained in:
Morph
2020-09-05 09:42:01 -04:00
parent 797564599f
commit 5b6268d26a
7 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,11 +340,6 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
motions_param[motion_id].Clear();
motion_map[motion_id]->setText(tr("[not set]"));
});
context_menu.addAction(tr("Restore Default"), [&] {
motions_param[motion_id] = Common::ParamPackage{
InputCommon::GenerateKeyboardParam(Config::default_motions[motion_id])};
motion_map[motion_id]->setText(ButtonToText(motions_param[motion_id]));
});
context_menu.exec(motion_map[motion_id]->mapToGlobal(menu_location));
});
}
@ -738,7 +733,11 @@ void ConfigureInputPlayer::UpdateMappingWithDefaults() {
void ConfigureInputPlayer::HandleClick(
QPushButton* button, std::function<void(const Common::ParamPackage&)> new_input_setter,
InputCommon::Polling::DeviceType type) {
button->setText(tr("[waiting]"));
if (button == ui->buttonMotionLeft || button == ui->buttonMotionRight) {
button->setText(tr("Shake!"));
} else {
button->setText(tr("[waiting]"));
}
button->setFocus();
// The first two input devices are always Any and Keyboard/Mouse. If the user filtered to a