Sync titlebar overlay with theme
All checks were successful
Build Windows App / build-windows (push) Successful in 25m10s

This commit is contained in:
MrSphay
2026-05-01 18:14:29 +02:00
parent 7f5ed594b7
commit c76489a1e4
4 changed files with 40 additions and 3 deletions

View File

@@ -5,6 +5,17 @@ import { fileURLToPath } from "node:url";
const __dirname = path.dirname(fileURLToPath(import.meta.url)); const __dirname = path.dirname(fileURLToPath(import.meta.url));
const titleBarThemes = {
light: {
color: "#eef1ed",
symbolColor: "#17241d"
},
dark: {
color: "#132019",
symbolColor: "#e9f3ec"
}
};
async function createWindow() { async function createWindow() {
const win = new BrowserWindow({ const win = new BrowserWindow({
width: 1220, width: 1220,
@@ -14,8 +25,7 @@ async function createWindow() {
title: "EnvHelper", title: "EnvHelper",
titleBarStyle: "hidden", titleBarStyle: "hidden",
titleBarOverlay: { titleBarOverlay: {
color: "#eef1ed", ...titleBarThemes.light,
symbolColor: "#17241d",
height: 34 height: 34
}, },
autoHideMenuBar: true, autoHideMenuBar: true,
@@ -53,6 +63,13 @@ ipcMain.handle("envhelper:open-file", async () => {
}; };
}); });
ipcMain.handle("envhelper:set-titlebar-theme", (event, theme: "light" | "dark") => {
BrowserWindow.fromWebContents(event.sender)?.setTitleBarOverlay({
...titleBarThemes[theme],
height: 34
});
});
ipcMain.handle("envhelper:save-file", async (_event, content: string) => { ipcMain.handle("envhelper:save-file", async (_event, content: string) => {
const result = await dialog.showSaveDialog({ const result = await dialog.showSaveDialog({
defaultPath: ".env", defaultPath: ".env",

View File

@@ -2,5 +2,6 @@ import { contextBridge, ipcRenderer } from "electron";
contextBridge.exposeInMainWorld("envHelper", { contextBridge.exposeInMainWorld("envHelper", {
openFile: () => ipcRenderer.invoke("envhelper:open-file"), openFile: () => ipcRenderer.invoke("envhelper:open-file"),
saveFile: (content: string) => ipcRenderer.invoke("envhelper:save-file", content) saveFile: (content: string) => ipcRenderer.invoke("envhelper:save-file", content),
setTitlebarTheme: (theme: "light" | "dark") => ipcRenderer.invoke("envhelper:set-titlebar-theme", theme)
}); });

View File

@@ -271,6 +271,14 @@ function readTheme(): ThemeMode {
return stored && themeLabels.includes(stored) ? stored : "system"; return stored && themeLabels.includes(stored) ? stored : "system";
} }
function getEffectiveTheme(themeMode: ThemeMode): "light" | "dark" {
if (themeMode !== "system") {
return themeMode;
}
return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
}
export default function App() { export default function App() {
const [input, setInput] = useState(sampleEnv); const [input, setInput] = useState(sampleEnv);
const [loadedPath, setLoadedPath] = useState<string | null>(null); const [loadedPath, setLoadedPath] = useState<string | null>(null);
@@ -286,6 +294,16 @@ export default function App() {
useEffect(() => { useEffect(() => {
document.documentElement.dataset.theme = themeMode; document.documentElement.dataset.theme = themeMode;
localStorage.setItem("envhelper-theme", themeMode); localStorage.setItem("envhelper-theme", themeMode);
const updateTitlebar = () => {
void window.envHelper?.setTitlebarTheme(getEffectiveTheme(themeMode));
};
const media = window.matchMedia("(prefers-color-scheme: dark)");
updateTitlebar();
media.addEventListener("change", updateTitlebar);
return () => media.removeEventListener("change", updateTitlebar);
}, [themeMode]); }, [themeMode]);
useEffect(() => { useEffect(() => {

1
src/vite-env.d.ts vendored
View File

@@ -9,5 +9,6 @@ interface Window {
envHelper?: { envHelper?: {
openFile: () => Promise<EnvHelperFileResult | null>; openFile: () => Promise<EnvHelperFileResult | null>;
saveFile: (content: string) => Promise<string | null>; saveFile: (content: string) => Promise<string | null>;
setTitlebarTheme: (theme: "light" | "dark") => Promise<void>;
}; };
} }