diff options
| author | bunnei <bunneidev@gmail.com> | 2022-01-21 20:51:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 20:51:29 +0100 |
| commit | 88d9b55b14e2647076be6ca87af757d95d473641 (patch) | |
| tree | 63d4a29e61d27d95bd7cbd3f46b4b9ae4577a7c1 | |
| parent | Merge pull request #7731 from v1993/xfb-varying-check-fix (diff) | |
| parent | Use Default Colorful theme by default outside of Windows (diff) | |
| download | yuzu-88d9b55b14e2647076be6ca87af757d95d473641.tar yuzu-88d9b55b14e2647076be6ca87af757d95d473641.tar.gz yuzu-88d9b55b14e2647076be6ca87af757d95d473641.tar.bz2 yuzu-88d9b55b14e2647076be6ca87af757d95d473641.tar.lz yuzu-88d9b55b14e2647076be6ca87af757d95d473641.tar.xz yuzu-88d9b55b14e2647076be6ca87af757d95d473641.tar.zst yuzu-88d9b55b14e2647076be6ca87af757d95d473641.zip | |
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 9 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.h | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 33d50667a..8c370ff91 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -745,8 +745,7 @@ void Config::ReadUIValues() { UISettings::values.theme = ReadSetting( QStringLiteral("theme"), - QString::fromUtf8( - UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second)) + QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second)) .toString(); ReadBasicSetting(UISettings::values.enable_discord_presence); ReadBasicSetting(UISettings::values.select_user_on_boot); @@ -1273,10 +1272,8 @@ void Config::SaveSystemValues() { void Config::SaveUIValues() { qt_config->beginGroup(QStringLiteral("UI")); - WriteSetting( - QStringLiteral("theme"), UISettings::values.theme, - QString::fromUtf8( - UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second)); + WriteSetting(QStringLiteral("theme"), UISettings::values.theme, + QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second)); WriteBasicSetting(UISettings::values.enable_discord_presence); WriteBasicSetting(UISettings::values.select_user_on_boot); diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index d673c1cdc..8f4576def 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -48,6 +48,14 @@ public: static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods; static const std::array<UISettings::Shortcut, 21> default_hotkeys; + static constexpr UISettings::Theme default_theme{ +#ifdef _WIN32 + UISettings::Theme::DarkColorful +#else + UISettings::Theme::DefaultColorful +#endif + }; + private: void Initialize(const std::string& config_name); |