MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 14:53:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: theme fallback issue

Browse Source
This commit is contained in:
pa
2026-01-05 20:35:16 +09:00
committed by Natsumi
parent c80562c623
commit 61813da917
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/NavMenu.vue
View File

@@ -204,20 +204,6 @@
✓ ✓
</span> </span>
</button> </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> </div>
<template #reference> <template #reference>
<button type="button" class="nav-menu-theme__item" @click.prevent> <button type="button" class="nav-menu-theme__item" @click.prevent>

2
src/shared/utils/base/ui.js
View File

@@ -78,6 +78,8 @@ function changeAppThemeStyle(themeMode) {
// load system theme as fallback // load system theme as fallback
themeMode = systemIsDarkMode() ? 'dark' : 'light'; themeMode = systemIsDarkMode() ? 'dark' : 'light';
themeConfig = THEME_CONFIG[themeMode]; themeConfig = THEME_CONFIG[themeMode];
const appSettingsStore = useAppearanceSettingsStore();
appSettingsStore.setThemeMode(themeMode);
} }
const cssFiles = Array.isArray(themeConfig.cssFiles) const cssFiles = Array.isArray(themeConfig.cssFiles)

6
src/stores/settings/appearance.js
View File

@@ -211,7 +211,6 @@ export const useAppearanceSettingsStore = defineStore(
themeMode.value = normalizedThemeMode; themeMode.value = normalizedThemeMode;
applyThemeMode(); applyThemeMode();
await changeAppThemeStyle(themeMode.value);
await initPrimaryColor(); await initPrimaryColor();
displayVRCPlusIconsAsAvatar.value = displayVRCPlusIconsAsAvatar.value =
@@ -462,6 +461,7 @@ export const useAppearanceSettingsStore = defineStore(
configRepository.setString('VRCX_ThemeMode', normalizedThemeMode); configRepository.setString('VRCX_ThemeMode', normalizedThemeMode);
applyThemeMode(); applyThemeMode();
} }
function applyThemeMode() { function applyThemeMode() {
if (themeMode.value === 'light') { if (themeMode.value === 'light') {
setIsDarkMode(false); setIsDarkMode(false);
@@ -471,6 +471,7 @@ export const useAppearanceSettingsStore = defineStore(
setIsDarkMode(true); setIsDarkMode(true);
} }
} }
/** /**
* @param {boolean} isDark * @param {boolean} isDark
*/ */
@@ -878,7 +879,8 @@ export const useAppearanceSettingsStore = defineStore(
setNotificationIconDot, setNotificationIconDot,
applyCompactTableMode, applyCompactTableMode,
setNavCollapsed, setNavCollapsed,
toggleNavCollapsed toggleNavCollapsed,
setThemeMode
}; };
} }
); );