Feature:新增多套应用配色主题 (#2559)
Co-authored-by: staff <staff@qimaos-MacBook-Pro.local>
This commit is contained in:
1 parent
896580f1c5
commit
5c35755219
27 files changed
+1884
-99
No files matched your search
@@ -14,7 +14,7 @@ import { clampEditorFontSize, createEditorZoomCommitScheduler, fontSizeFromGestu
|
||||
import i18n from "@/i18n";
|
||||
import EditorSearchPanel from "@/components/editor/EditorSearchPanel.vue";
|
||||
import type { EditorTheme } from "@/stores/settingsStore";
|
||||
import type { AppThemeAppearance } from "@/lib/app/appTheme";
|
||||
import type { AppThemeAppearance, AppThemePalette } from "@/lib/app/appTheme";
|
||||
|
||||
export interface UseCellDetailEditorOptions {
|
||||
onChange?: (value: string) => void;
|
||||
@@ -24,6 +24,7 @@ export interface UseCellDetailEditorOptions {
|
||||
readOnly?: boolean;
|
||||
editorTheme: () => EditorTheme;
|
||||
appAppearance: () => AppThemeAppearance;
|
||||
appPalette: () => AppThemePalette;
|
||||
fontSize: () => number;
|
||||
fontFamily: () => string;
|
||||
}
|
||||
@@ -130,14 +131,14 @@ export function useCellDetailEditor(options: UseCellDetailEditorOptions): UseCel
|
||||
zoomCommitScheduler.flush(liveFontSize);
|
||||
}
|
||||
|
||||
watch([() => options.fontSize(), () => options.fontFamily(), () => options.editorTheme(), () => options.appAppearance()], async ([fontSize, fontFamily, editorTheme, appearance]) => {
|
||||
watch([() => options.fontSize(), () => options.fontFamily(), () => options.editorTheme(), () => options.appAppearance(), () => options.appPalette()], async ([fontSize, fontFamily, editorTheme, appearance, palette]) => {
|
||||
const editor = view.value;
|
||||
if (!editor || destroyed) return;
|
||||
if (!isGestureZooming && !zoomCommitScheduler.hasPendingCommit()) {
|
||||
liveFontSize = clampEditorFontSize(fontSize);
|
||||
}
|
||||
syncEditorFontCssVars(liveFontSize, fontFamily);
|
||||
const theme = await loadEditorTheme(editorTheme, appearance);
|
||||
const theme = await loadEditorTheme(editorTheme, appearance, undefined, palette);
|
||||
if (!view.value || destroyed) return;
|
||||
view.value.dispatch({
|
||||
effects: [themeComp.reconfigure(theme), fontThemeComp.reconfigure(editorFontTheme(EditorView, liveFontSize, fontFamily, { fixedHeight: true, scrollable: true }))],
|
||||
@@ -150,7 +151,7 @@ export function useCellDetailEditor(options: UseCellDetailEditorOptions): UseCel
|
||||
const doc = initialValue ?? "";
|
||||
currentIsJson = options.language === "json" || shouldUseJsonMode(columnType, doc);
|
||||
|
||||
const theme = await loadEditorTheme(options.editorTheme(), options.appAppearance());
|
||||
const theme = await loadEditorTheme(options.editorTheme(), options.appAppearance(), undefined, options.appPalette());
|
||||
liveFontSize = clampEditorFontSize(options.fontSize());
|
||||
const fontTheme = editorFontTheme(EditorView, liveFontSize, options.fontFamily(), { fixedHeight: true, scrollable: true });
|
||||
const shortcuts = settingsStore.editorSettings.shortcuts;
|
||||
|
||||
@@ -1,9 +1,25 @@
|
||||
import { computed, ref } from "vue";
|
||||
import { APP_THEME_STORAGE_KEY, getTauriThemeForMode, normalizeAppThemeMode, resolveAppThemeAppearance, type AppThemeMode } from "@/lib/app/appTheme";
|
||||
import {
|
||||
APP_THEME_PALETTE_CLASS_NAMES,
|
||||
APP_THEME_PALETTE_STORAGE_KEY,
|
||||
APP_THEME_STORAGE_KEY,
|
||||
getAppThemePaletteClass,
|
||||
getTauriThemeForMode,
|
||||
isSystemAppThemeMode,
|
||||
normalizeAppThemeMode,
|
||||
normalizeAppThemePalette,
|
||||
resolveAppThemeAppearance,
|
||||
type AppThemeMode,
|
||||
type AppThemePalette,
|
||||
} from "@/lib/app/appTheme";
|
||||
import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";
|
||||
import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
|
||||
|
||||
const themeMode = ref<AppThemeMode>(normalizeAppThemeMode(safeLocalStorageGet(APP_THEME_STORAGE_KEY)));
|
||||
const savedThemeMode = safeLocalStorageGet(APP_THEME_STORAGE_KEY);
|
||||
const themeMode = ref<AppThemeMode>(normalizeAppThemeMode(savedThemeMode));
|
||||
const savedThemePalette = safeLocalStorageGet(APP_THEME_PALETTE_STORAGE_KEY);
|
||||
const themePalette = ref<AppThemePalette>(normalizeAppThemePalette(savedThemePalette));
|
||||
if (savedThemeMode && savedThemeMode !== themeMode.value) safeLocalStorageSet(APP_THEME_STORAGE_KEY, themeMode.value);
|
||||
const systemPrefersDark = ref(readSystemPrefersDark());
|
||||
const isDark = computed(() => resolveAppThemeAppearance(themeMode.value, systemPrefersDark.value) === "dark");
|
||||
|
||||
@@ -22,7 +38,7 @@ function setupSystemThemeListener() {
|
||||
systemPrefersDark.value = mediaQuery.matches;
|
||||
const onChange = (event: MediaQueryListEvent) => {
|
||||
systemPrefersDark.value = event.matches;
|
||||
if (themeMode.value === "system") applyTheme();
|
||||
if (isSystemAppThemeMode(themeMode.value)) applyTheme();
|
||||
};
|
||||
mediaQuery.addEventListener("change", onChange);
|
||||
isListeningForSystemTheme = true;
|
||||
@@ -36,6 +52,9 @@ function applyTheme() {
|
||||
|
||||
doc.classList.add("disable-transitions");
|
||||
doc.classList.toggle("dark", dark);
|
||||
for (const className of APP_THEME_PALETTE_CLASS_NAMES) doc.classList.remove(className);
|
||||
const paletteClass = getAppThemePaletteClass(themePalette.value);
|
||||
if (paletteClass) doc.classList.add(paletteClass);
|
||||
doc.style.colorScheme = dark ? "dark" : "light";
|
||||
|
||||
// force reflow so the class toggle takes effect before re-enabling transitions
|
||||
@@ -65,6 +84,12 @@ function setThemeMode(mode: AppThemeMode) {
|
||||
applyTheme();
|
||||
}
|
||||
|
||||
function setThemePalette(palette: AppThemePalette) {
|
||||
themePalette.value = palette;
|
||||
safeLocalStorageSet(APP_THEME_PALETTE_STORAGE_KEY, palette);
|
||||
applyTheme();
|
||||
}
|
||||
|
||||
export function useTheme() {
|
||||
setupSystemThemeListener();
|
||||
|
||||
@@ -72,5 +97,5 @@ export function useTheme() {
|
||||
setThemeMode(isDark.value ? "light" : "dark");
|
||||
}
|
||||
|
||||
return { isDark, themeMode, applyTheme, setThemeMode, toggleTheme };
|
||||
return { isDark, themeMode, themePalette, applyTheme, setThemeMode, setThemePalette, toggleTheme };
|
||||
}
|
||||
Reference in new issue
Block a user