ShuriZma
/
suyu
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10931 from german77/clang 

yuzu: Fix clang format
This commit is contained in:
Morph 2023-06-27 18:11:22 -04:00 committed by GitHub
parent 112b660456 30544fbfa5
commit bd4fefe5e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/yuzu/configuration/configure_general.cpp
View File

@ -41,7 +41,8 @@ void ConfigureGeneral::SetConfiguration() {
ui->toggle_background_pause->setChecked(UISettings::values.pause_when_in_background.GetValue()); ui->toggle_background_pause->setChecked(UISettings::values.pause_when_in_background.GetValue());
ui->toggle_hide_mouse->setChecked(UISettings::values.hide_mouse.GetValue()); ui->toggle_hide_mouse->setChecked(UISettings::values.hide_mouse.GetValue());
ui->toggle_controller_applet_disabled->setEnabled(runtime_lock); 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->toggle_speed_limit->setChecked(Settings::values.use_speed_limit.GetValue());
ui->speed_limit->setValue(Settings::values.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.select_user_on_boot = ui->toggle_user_on_boot->isChecked();
UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked(); UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked();
UISettings::values.hide_mouse = ui->toggle_hide_mouse->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 // Guard if during game and set to game-specific value
if (Settings::values.use_speed_limit.UsingGlobal()) { if (Settings::values.use_speed_limit.UsingGlobal()) {

21
src/yuzu/main.cpp
View File

@ -1707,16 +1707,17 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p
system->SetFilesystem(vfs); system->SetFilesystem(vfs);
system->SetAppletFrontendSet({ system->SetAppletFrontendSet({
std::make_unique<QtAmiiboSettings>(*this), // Amiibo Settings std::make_unique<QtAmiiboSettings>(*this), // Amiibo Settings
(UISettings::values.controller_applet_disabled.GetValue() == true) ? nullptr : (UISettings::values.controller_applet_disabled.GetValue() == true)
std::make_unique<QtControllerSelector>(*this), // Controller Selector ? nullptr
std::make_unique<QtErrorDisplay>(*this), // Error Display : std::make_unique<QtControllerSelector>(*this), // Controller Selector
nullptr, // Mii Editor std::make_unique<QtErrorDisplay>(*this), // Error Display
nullptr, // Parental Controls nullptr, // Mii Editor
nullptr, // Photo Viewer nullptr, // Parental Controls
std::make_unique<QtProfileSelector>(*this), // Profile Selector nullptr, // Photo Viewer
std::make_unique<QtSoftwareKeyboard>(*this), // Software Keyboard std::make_unique<QtProfileSelector>(*this), // Profile Selector
std::make_unique<QtWebBrowser>(*this), // Web Browser std::make_unique<QtSoftwareKeyboard>(*this), // Software Keyboard
std::make_unique<QtWebBrowser>(*this), // Web Browser
}); });
const Core::SystemResultStatus result{ const Core::SystemResultStatus result{