Browse Source
Merge pull request #10931 from german77/clang
yuzu: Fix clang format
pull/15/merge
Morph
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
15 additions and
12 deletions
-
src/yuzu/configuration/configure_general.cpp
-
src/yuzu/main.cpp
|
|
|
@ -41,7 +41,8 @@ void ConfigureGeneral::SetConfiguration() { |
|
|
|
ui->toggle_background_pause->setChecked(UISettings::values.pause_when_in_background.GetValue()); |
|
|
|
ui->toggle_hide_mouse->setChecked(UISettings::values.hide_mouse.GetValue()); |
|
|
|
ui->toggle_controller_applet_disabled->setEnabled(runtime_lock); |
|
|
|
ui->toggle_controller_applet_disabled->setChecked(UISettings::values.controller_applet_disabled.GetValue()); |
|
|
|
ui->toggle_controller_applet_disabled->setChecked( |
|
|
|
UISettings::values.controller_applet_disabled.GetValue()); |
|
|
|
|
|
|
|
ui->toggle_speed_limit->setChecked(Settings::values.use_speed_limit.GetValue()); |
|
|
|
ui->speed_limit->setValue(Settings::values.speed_limit.GetValue()); |
|
|
|
@ -84,7 +85,8 @@ void ConfigureGeneral::ApplyConfiguration() { |
|
|
|
UISettings::values.select_user_on_boot = ui->toggle_user_on_boot->isChecked(); |
|
|
|
UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked(); |
|
|
|
UISettings::values.hide_mouse = ui->toggle_hide_mouse->isChecked(); |
|
|
|
UISettings::values.controller_applet_disabled = ui->toggle_controller_applet_disabled->isChecked(); |
|
|
|
UISettings::values.controller_applet_disabled = |
|
|
|
ui->toggle_controller_applet_disabled->isChecked(); |
|
|
|
|
|
|
|
// Guard if during game and set to game-specific value
|
|
|
|
if (Settings::values.use_speed_limit.UsingGlobal()) { |
|
|
|
|
|
|
|
@ -1708,8 +1708,9 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p |
|
|
|
|
|
|
|
system->SetAppletFrontendSet({ |
|
|
|
std::make_unique<QtAmiiboSettings>(*this), // Amiibo Settings
|
|
|
|
(UISettings::values.controller_applet_disabled.GetValue() == true) ? nullptr : |
|
|
|
std::make_unique<QtControllerSelector>(*this), // Controller Selector
|
|
|
|
(UISettings::values.controller_applet_disabled.GetValue() == true) |
|
|
|
? nullptr |
|
|
|
: std::make_unique<QtControllerSelector>(*this), // Controller Selector
|
|
|
|
std::make_unique<QtErrorDisplay>(*this), // Error Display
|
|
|
|
nullptr, // Mii Editor
|
|
|
|
nullptr, // Parental Controls
|
|
|
|
|