UI: Set default theme to Yami

Note that this adds a new CurrentTheme3 config variable to preserve
settings of versions older than 28, making this change safely
backward-compatible.
This commit is contained in:
jp9000
2022-07-28 20:38:51 -07:00
parent de01cfc063
commit 8ef134be79
3 changed files with 3 additions and 18 deletions
+1 -16
View File
@@ -474,11 +474,6 @@ bool OBSApp::InitGlobalConfigDefaults()
config_set_default_bool(globalConfig, "BasicWindow", "StudioModeLabels",
true);
if (!config_get_bool(globalConfig, "General", "Pre21Defaults")) {
config_set_default_string(globalConfig, "General",
"CurrentTheme", DEFAULT_THEME);
}
config_set_default_string(globalConfig, "General", "HotkeyFocusType",
"NeverDisableHotkeys");
@@ -1138,19 +1133,9 @@ bool OBSApp::InitTheme()
defaultStyleSheet = styleSheet();
const char *themeName =
config_get_string(globalConfig, "General", "CurrentTheme2");
if (!themeName)
/* Use deprecated "CurrentTheme" value if available */
themeName = config_get_string(globalConfig, "General",
"CurrentTheme");
if (!themeName)
/* Use deprecated "Theme" value if available */
themeName = config_get_string(globalConfig, "General", "Theme");
config_get_string(globalConfig, "General", "CurrentTheme3");
if (!themeName)
themeName = DEFAULT_THEME;
if (!themeName)
themeName = "Dark";
if (strcmp(themeName, "Default") == 0)
themeName = "System";