Browse Source
Merge pull request #7755 from v1993/someone-in-here-lacks-system-wide-theming
Use Default Colorful theme by default outside of Windows
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
11 additions and
6 deletions
-
src/yuzu/configuration/config.cpp
-
src/yuzu/configuration/config.h
|
|
|
@ -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); |
|
|
|
|
|
|
|
|
|
|
|
@ -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); |
|
|
|
|
|
|
|
|