Use native window controls
All checks were successful
Build Windows App / build-windows (push) Successful in 20m26s

This commit is contained in:
MrSphay
2026-05-01 17:45:16 +02:00
parent fab6888e80
commit 7f5ed594b7
6 changed files with 9 additions and 72 deletions

View File

@@ -1,5 +1,4 @@
import { app, BrowserWindow, Menu, dialog, ipcMain } from "electron"; import { app, BrowserWindow, Menu, dialog, ipcMain } from "electron";
import isDev from "electron-is-dev";
import { readFile, writeFile } from "node:fs/promises"; import { readFile, writeFile } from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import { fileURLToPath } from "node:url"; import { fileURLToPath } from "node:url";
@@ -13,7 +12,12 @@ async function createWindow() {
minWidth: 980, minWidth: 980,
minHeight: 680, minHeight: 680,
title: "EnvHelper", title: "EnvHelper",
frame: false, titleBarStyle: "hidden",
titleBarOverlay: {
color: "#eef1ed",
symbolColor: "#17241d",
height: 34
},
autoHideMenuBar: true, autoHideMenuBar: true,
backgroundColor: "#f6f7f4", backgroundColor: "#f6f7f4",
webPreferences: { webPreferences: {
@@ -25,7 +29,7 @@ async function createWindow() {
Menu.setApplicationMenu(null); Menu.setApplicationMenu(null);
if (isDev) { if (!app.isPackaged) {
await win.loadURL("http://127.0.0.1:5173"); await win.loadURL("http://127.0.0.1:5173");
} else { } else {
await win.loadFile(path.join(__dirname, "../dist/index.html")); await win.loadFile(path.join(__dirname, "../dist/index.html"));
@@ -49,27 +53,6 @@ ipcMain.handle("envhelper:open-file", async () => {
}; };
}); });
ipcMain.handle("envhelper:window-minimize", (event) => {
BrowserWindow.fromWebContents(event.sender)?.minimize();
});
ipcMain.handle("envhelper:window-toggle-maximize", (event) => {
const win = BrowserWindow.fromWebContents(event.sender);
if (!win) {
return;
}
if (win.isMaximized()) {
win.unmaximize();
} else {
win.maximize();
}
});
ipcMain.handle("envhelper:window-close", (event) => {
BrowserWindow.fromWebContents(event.sender)?.close();
});
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,8 +2,5 @@ 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)
minimizeWindow: () => ipcRenderer.invoke("envhelper:window-minimize"),
toggleMaximizeWindow: () => ipcRenderer.invoke("envhelper:window-toggle-maximize"),
closeWindow: () => ipcRenderer.invoke("envhelper:window-close")
}); });

View File

@@ -17,7 +17,6 @@
"lint": "tsc --noEmit" "lint": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"electron-is-dev": "^3.0.1",
"lucide-react": "^0.468.0", "lucide-react": "^0.468.0",
"react": "^19.1.1", "react": "^19.1.1",
"react-dom": "^19.1.1" "react-dom": "^19.1.1"

View File

@@ -4,8 +4,6 @@ import {
FileDown, FileDown,
FileInput, FileInput,
Languages, Languages,
Maximize2,
Minus,
Plus, Plus,
RefreshCcw, RefreshCcw,
Settings, Settings,
@@ -335,17 +333,6 @@ export default function App() {
<div className="titlebarMark">EH</div> <div className="titlebarMark">EH</div>
<span>EnvHelper</span> <span>EnvHelper</span>
</div> </div>
<div className="windowControls">
<button onClick={() => window.envHelper?.minimizeWindow()} title="Minimize" type="button">
<Minus size={15} />
</button>
<button onClick={() => window.envHelper?.toggleMaximizeWindow()} title="Maximize" type="button">
<Maximize2 size={14} />
</button>
<button className="closeButton" onClick={() => window.envHelper?.closeWindow()} title="Close" type="button">
<X size={15} />
</button>
</div>
</section> </section>
<header className="toolbar"> <header className="toolbar">

View File

@@ -155,6 +155,7 @@ textarea:focus {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
overflow: hidden; overflow: hidden;
padding-right: 138px;
} }
.titlebarBrand { .titlebarBrand {
@@ -180,33 +181,6 @@ textarea:focus {
width: 24px; width: 24px;
} }
.windowControls {
-webkit-app-region: no-drag;
align-items: stretch;
display: flex;
height: 100%;
}
.windowControls button {
background: transparent;
border-radius: 0;
color: var(--muted);
min-height: 0;
min-width: 44px;
padding: 0;
}
.windowControls button:hover {
background: var(--surface-subtle);
color: var(--text);
transform: none;
}
.windowControls .closeButton:hover {
background: #c93d32;
color: #fff;
}
.toolbar { .toolbar {
align-items: center; align-items: center;
background: var(--surface); background: var(--surface);

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

@@ -9,8 +9,5 @@ interface Window {
envHelper?: { envHelper?: {
openFile: () => Promise<EnvHelperFileResult | null>; openFile: () => Promise<EnvHelperFileResult | null>;
saveFile: (content: string) => Promise<string | null>; saveFile: (content: string) => Promise<string | null>;
minimizeWindow: () => Promise<void>;
toggleMaximizeWindow: () => Promise<void>;
closeWindow: () => Promise<void>;
}; };
} }