Merge pull request #7755 from v1993/someone-in-here-lacks-system-wide-theming
Use Default Colorful theme by default outside of Windows
This commit is contained in:
commit
88d9b55b14
@ -745,8 +745,7 @@ void Config::ReadUIValues() {
|
|||||||
UISettings::values.theme =
|
UISettings::values.theme =
|
||||||
ReadSetting(
|
ReadSetting(
|
||||||
QStringLiteral("theme"),
|
QStringLiteral("theme"),
|
||||||
QString::fromUtf8(
|
QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second))
|
||||||
UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second))
|
|
||||||
.toString();
|
.toString();
|
||||||
ReadBasicSetting(UISettings::values.enable_discord_presence);
|
ReadBasicSetting(UISettings::values.enable_discord_presence);
|
||||||
ReadBasicSetting(UISettings::values.select_user_on_boot);
|
ReadBasicSetting(UISettings::values.select_user_on_boot);
|
||||||
@ -1273,10 +1272,8 @@ void Config::SaveSystemValues() {
|
|||||||
void Config::SaveUIValues() {
|
void Config::SaveUIValues() {
|
||||||
qt_config->beginGroup(QStringLiteral("UI"));
|
qt_config->beginGroup(QStringLiteral("UI"));
|
||||||
|
|
||||||
WriteSetting(
|
WriteSetting(QStringLiteral("theme"), UISettings::values.theme,
|
||||||
QStringLiteral("theme"), UISettings::values.theme,
|
QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second));
|
||||||
QString::fromUtf8(
|
|
||||||
UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second));
|
|
||||||
WriteBasicSetting(UISettings::values.enable_discord_presence);
|
WriteBasicSetting(UISettings::values.enable_discord_presence);
|
||||||
WriteBasicSetting(UISettings::values.select_user_on_boot);
|
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<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods;
|
||||||
static const std::array<UISettings::Shortcut, 21> default_hotkeys;
|
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:
|
private:
|
||||||
void Initialize(const std::string& config_name);
|
void Initialize(const std::string& config_name);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user