mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-14 12:23:52 +02:00
fix: theme fallback issue
This commit is contained in:
@@ -204,20 +204,6 @@
|
||||
✓
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<el-divider></el-divider>
|
||||
|
||||
<div class="nav-menu-theme__custom">
|
||||
<span class="nav-menu-theme__custom-label">{{
|
||||
t('view.settings.appearance.theme_color.header')
|
||||
}}</span>
|
||||
<el-color-picker
|
||||
:model-value="currentPrimary"
|
||||
size="small"
|
||||
:disabled="isApplyingPrimaryColor"
|
||||
:teleported="false"
|
||||
@change="handleCustomThemeColorChange" />
|
||||
</div>
|
||||
</div>
|
||||
<template #reference>
|
||||
<button type="button" class="nav-menu-theme__item" @click.prevent>
|
||||
|
||||
@@ -78,6 +78,8 @@ function changeAppThemeStyle(themeMode) {
|
||||
// load system theme as fallback
|
||||
themeMode = systemIsDarkMode() ? 'dark' : 'light';
|
||||
themeConfig = THEME_CONFIG[themeMode];
|
||||
const appSettingsStore = useAppearanceSettingsStore();
|
||||
appSettingsStore.setThemeMode(themeMode);
|
||||
}
|
||||
|
||||
const cssFiles = Array.isArray(themeConfig.cssFiles)
|
||||
|
||||
@@ -211,7 +211,6 @@ export const useAppearanceSettingsStore = defineStore(
|
||||
|
||||
themeMode.value = normalizedThemeMode;
|
||||
applyThemeMode();
|
||||
await changeAppThemeStyle(themeMode.value);
|
||||
await initPrimaryColor();
|
||||
|
||||
displayVRCPlusIconsAsAvatar.value =
|
||||
@@ -462,6 +461,7 @@ export const useAppearanceSettingsStore = defineStore(
|
||||
configRepository.setString('VRCX_ThemeMode', normalizedThemeMode);
|
||||
applyThemeMode();
|
||||
}
|
||||
|
||||
function applyThemeMode() {
|
||||
if (themeMode.value === 'light') {
|
||||
setIsDarkMode(false);
|
||||
@@ -471,6 +471,7 @@ export const useAppearanceSettingsStore = defineStore(
|
||||
setIsDarkMode(true);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {boolean} isDark
|
||||
*/
|
||||
@@ -878,7 +879,8 @@ export const useAppearanceSettingsStore = defineStore(
|
||||
setNotificationIconDot,
|
||||
applyCompactTableMode,
|
||||
setNavCollapsed,
|
||||
toggleNavCollapsed
|
||||
toggleNavCollapsed,
|
||||
setThemeMode
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user