Skip to content

Commit 3d5a600

Browse files
author
T3 Code Test
committed
fix(desktop): preserve window button spacing when zooming out
1 parent 8f4fd09 commit 3d5a600

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

‎apps/desktop/src/preload.ts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type {
66
DesktopSnapShotEvent,
77
} from "@t3tools/contracts";
88
import { exposeClerkBridge } from "@clerk/electron/preload";
9-
import { contextBridge, ipcRenderer } from "electron";
9+
import { contextBridge, ipcRenderer, webFrame } from "electron";
1010

1111
import * as IpcChannels from "./ipc/channels.ts";
1212

@@ -32,6 +32,19 @@ exposeClerkBridge({ passkeys: true });
3232
// oxlint-disable-next-line t3code/no-global-process-runtime -- Electron exposes the client platform in its sandboxed preload process.
3333
const clientPlatform = process.platform;
3434

35+
if (clientPlatform === "darwin") {
36+
// Native window buttons do not scale with Chromium zoom. Keep their reserved
37+
// space in native points, including when a zoomed page is reloaded.
38+
const syncWindowControlInset = () => {
39+
document.documentElement.style.setProperty(
40+
"--desktop-window-controls-inset",
41+
`${90 / webFrame.getZoomFactor()}px`,
42+
);
43+
};
44+
window.addEventListener("DOMContentLoaded", syncWindowControlInset, { once: true });
45+
window.addEventListener("resize", syncWindowControlInset);
46+
}
47+
3548
function unwrapEnsureSshEnvironmentResult(result: unknown) {
3649
if (
3750
typeof result === "object" &&

‎apps/web/src/components/AppSidebarLayout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import {
4646
} from "./ui/sidebar";
4747
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
4848

49-
const MACOS_TRAFFIC_LIGHTS_LEFT_INSET = "90px";
49+
const MACOS_TRAFFIC_LIGHTS_LEFT_INSET = "var(--desktop-window-controls-inset, 90px)";
5050

5151
function subscribeToViewportWidth(onChange: () => void): () => void {
5252
window.addEventListener("resize", onChange);

0 commit comments

Comments
 (0)