From d00b8df7707c0a4ad94ce7a3488780fe5764ae6c Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Wed, 21 Jan 2026 22:35:05 +0800 Subject: [PATCH] feat(desktop): properly integrate window controls on windows (#9835) --- packages/app/src/components/titlebar.tsx | 18 +- packages/desktop/index.html | 1 + packages/desktop/src-tauri/Cargo.lock | 342 +++++++++++++++++- packages/desktop/src-tauri/Cargo.toml | 1 + .../src-tauri/capabilities/default.json | 8 + packages/desktop/src-tauri/src/lib.rs | 11 +- packages/desktop/src/index.tsx | 8 +- packages/desktop/src/styles.css | 7 + 8 files changed, 373 insertions(+), 23 deletions(-) create mode 100644 packages/desktop/src/styles.css diff --git a/packages/app/src/components/titlebar.tsx b/packages/app/src/components/titlebar.tsx index d0d27e99f..7e50687d5 100644 --- a/packages/app/src/components/titlebar.tsx +++ b/packages/app/src/components/titlebar.tsx @@ -18,6 +18,7 @@ export function Titlebar() { const theme = useTheme() const mac = createMemo(() => platform.platform === "desktop" && platform.os === "macos") + const windows = createMemo(() => platform.platform === "desktop" && platform.os === "windows") const reserve = createMemo( () => platform.platform === "desktop" && (platform.os === "windows" || platform.os === "linux"), ) @@ -75,13 +76,15 @@ export function Titlebar() { } return ( -
+
@@ -116,9 +119,16 @@ export function Titlebar() {
-
+
-
+
+ +
+
diff --git a/packages/desktop/index.html b/packages/desktop/index.html index f03666d5e..7bed1e8bd 100644 --- a/packages/desktop/index.html +++ b/packages/desktop/index.html @@ -18,6 +18,7 @@
+