Skip to content

Commit 9e76a08

Browse files
fix(desktop): refine header scaling and shadow (#573)
Co-authored-by: Cursor <[email protected]>
1 parent b74ec95 commit 9e76a08

5 files changed

Lines changed: 114 additions & 51 deletions

File tree

‎desktop/src/app/useWebviewZoomShortcuts.ts‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@ import { getCurrentWebview } from "@tauri-apps/api/webview";
44
import { hasPrimaryShortcutModifier } from "@/shared/lib/platform";
55

66
const DEFAULT_ZOOM_FACTOR = 1;
7-
const MIN_ZOOM_FACTOR = 0.2;
8-
const MAX_ZOOM_FACTOR = 10;
9-
const ZOOM_STEP = 0.2;
7+
const MIN_ZOOM_FACTOR = 0.75;
8+
const MAX_ZOOM_FACTOR = 1.5;
9+
const ZOOM_STEP = 0.1;
10+
const BASE_FONT_SIZE_PX = 16;
11+
const TEXT_SCALE_STORAGE_KEY = "sprout:text-scale";
1012

1113
type ZoomAction = "increase" | "decrease" | "reset";
1214

15+
function roundZoomFactor(zoomFactor: number) {
16+
return Math.round(zoomFactor * 10) / 10;
17+
}
18+
1319
function getZoomAction(event: KeyboardEvent): ZoomAction | null {
1420
if (!hasPrimaryShortcutModifier(event) || event.altKey) {
1521
return null;
@@ -49,17 +55,51 @@ function getNextZoomFactor(action: ZoomAction, zoomFactor: number) {
4955
}
5056

5157
if (action === "increase") {
52-
return Math.min(zoomFactor + ZOOM_STEP, MAX_ZOOM_FACTOR);
58+
return Math.min(roundZoomFactor(zoomFactor + ZOOM_STEP), MAX_ZOOM_FACTOR);
5359
}
5460

55-
return Math.max(zoomFactor - ZOOM_STEP, MIN_ZOOM_FACTOR);
61+
return Math.max(roundZoomFactor(zoomFactor - ZOOM_STEP), MIN_ZOOM_FACTOR);
62+
}
63+
64+
function readStoredZoomFactor() {
65+
const raw = window.localStorage.getItem(TEXT_SCALE_STORAGE_KEY);
66+
if (!raw) {
67+
return DEFAULT_ZOOM_FACTOR;
68+
}
69+
70+
const parsed = Number.parseFloat(raw);
71+
if (!Number.isFinite(parsed)) {
72+
return DEFAULT_ZOOM_FACTOR;
73+
}
74+
75+
return Math.min(Math.max(parsed, MIN_ZOOM_FACTOR), MAX_ZOOM_FACTOR);
76+
}
77+
78+
function applyTextScale(zoomFactor: number) {
79+
if (zoomFactor === DEFAULT_ZOOM_FACTOR) {
80+
document.documentElement.style.fontSize = "";
81+
window.localStorage.removeItem(TEXT_SCALE_STORAGE_KEY);
82+
return;
83+
}
84+
85+
document.documentElement.style.fontSize = `${BASE_FONT_SIZE_PX * zoomFactor}px`;
86+
window.localStorage.setItem(TEXT_SCALE_STORAGE_KEY, String(zoomFactor));
5687
}
5788

5889
export function useWebviewZoomShortcuts() {
5990
const zoomFactorRef = React.useRef(DEFAULT_ZOOM_FACTOR);
6091

6192
React.useLayoutEffect(() => {
6293
const webview = getCurrentWebview();
94+
const storedZoomFactor = readStoredZoomFactor();
95+
96+
zoomFactorRef.current = storedZoomFactor;
97+
applyTextScale(storedZoomFactor);
98+
99+
// Keep the webview coordinate system stable; only text should scale.
100+
void webview.setZoom(DEFAULT_ZOOM_FACTOR).catch((error) => {
101+
console.error("Failed to reset webview zoom", error);
102+
});
63103

64104
function handleKeyDown(event: KeyboardEvent) {
65105
const action = getZoomAction(event);
@@ -77,11 +117,7 @@ export function useWebviewZoomShortcuts() {
77117
}
78118

79119
zoomFactorRef.current = nextZoomFactor;
80-
81-
void webview.setZoom(nextZoomFactor).catch((error) => {
82-
zoomFactorRef.current = previousZoomFactor;
83-
console.error("Failed to update webview zoom", error);
84-
});
120+
applyTextScale(nextZoomFactor);
85121
}
86122

87123
window.addEventListener("keydown", handleKeyDown);

‎desktop/src/features/chat/ui/ChatHeader.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type ChatHeaderProps = {
2727
statusBadge?: React.ReactNode;
2828
};
2929

30-
const HEADER_ICON_CLASS = "h-3.5 w-3.5 text-muted-foreground";
30+
const HEADER_ICON_CLASS = "h-[14px] w-[14px] text-muted-foreground";
3131

3232
function ChannelIcon({
3333
channelType,
@@ -90,15 +90,15 @@ export function ChatHeader({
9090
return (
9191
<header
9292
className={cn(
93-
"relative z-30 flex min-h-11 min-w-0 shrink-0 cursor-default select-none items-center gap-2.5 bg-background/70 py-1.5 pl-4 pr-2 shadow-[0_4px_24px_rgba(0,0,0,0.06)] backdrop-blur-xl transition-[margin,padding] duration-200 ease-linear supports-[backdrop-filter]:bg-background/55 dark:shadow-[0_4px_24px_rgba(0,0,0,0.25)] sm:pl-6 sm:pr-3",
94-
overlaysContent && "-mb-11",
95-
reserveGlobalControls && "md:pl-40",
93+
"relative z-30 flex min-h-[44px] min-w-0 shrink-0 cursor-default select-none items-center gap-[10px] bg-background/70 py-[6px] pl-[16px] pr-[8px] backdrop-blur-xl transition-[margin,padding] duration-200 ease-linear supports-[backdrop-filter]:bg-background/55 sm:pl-[24px] sm:pr-[12px]",
94+
overlaysContent && "-mb-[44px]",
95+
reserveGlobalControls && "md:pl-[160px]",
9696
)}
9797
data-testid="chat-header"
9898
data-tauri-drag-region
9999
>
100100
<div className="min-w-0 flex-1">
101-
<div className="flex min-w-0 flex-wrap items-center gap-1">
101+
<div className="flex min-w-0 flex-wrap items-center gap-[4px]">
102102
<ChannelIcon
103103
channelType={channelType}
104104
mode={mode}

‎desktop/src/shared/ui/ViewLoadingFallback.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ function LoadingHeaderSkeleton() {
2222
return (
2323
<header
2424
className={cn(
25-
"flex min-h-11 min-w-0 cursor-default select-none items-center gap-2.5 bg-background/70 py-1.5 pl-4 pr-2 shadow-[0_4px_24px_rgba(0,0,0,0.06)] backdrop-blur-xl transition-[padding] duration-200 ease-linear supports-[backdrop-filter]:bg-background/55 dark:shadow-[0_4px_24px_rgba(0,0,0,0.25)] sm:pl-6 sm:pr-3",
26-
sidebarState === "collapsed" && "md:pl-40",
25+
"flex min-h-[44px] min-w-0 cursor-default select-none items-center gap-[10px] bg-background/70 py-[6px] pl-[16px] pr-[8px] shadow-[0_4px_24px_rgba(0,0,0,0.06)] backdrop-blur-xl transition-[padding] duration-200 ease-linear supports-[backdrop-filter]:bg-background/55 dark:shadow-[0_4px_24px_rgba(0,0,0,0.25)] sm:pl-[24px] sm:pr-[12px]",
26+
sidebarState === "collapsed" && "md:pl-[160px]",
2727
)}
2828
data-tauri-drag-region
2929
>
3030
<div className="min-w-0 flex-1">
31-
<div className="flex min-w-0 items-center gap-1.5">
31+
<div className="flex min-w-0 items-center gap-[6px]">
3232
<Skeleton className="h-3.5 w-3.5 rounded-sm" />
3333
<Skeleton className="h-4 w-28 max-w-[50vw]" />
3434
</div>

‎desktop/src/shared/ui/sidebar.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import {
2626

2727
const SIDEBAR_COOKIE_NAME = "sidebar_state";
2828
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
29-
const SIDEBAR_WIDTH = "16rem";
30-
const SIDEBAR_WIDTH_MOBILE = "18rem";
31-
const SIDEBAR_WIDTH_ICON = "3rem";
29+
const SIDEBAR_WIDTH = "256px";
30+
const SIDEBAR_WIDTH_MOBILE = "288px";
31+
const SIDEBAR_WIDTH_ICON = "48px";
3232
const SIDEBAR_KEYBOARD_SHORTCUT = "s";
3333

3434
type SidebarContextProps = {
@@ -237,7 +237,7 @@ const Sidebar = React.forwardRef<
237237
"group-data-[collapsible=offcanvas]:w-0",
238238
"group-data-[side=right]:rotate-180",
239239
variant === "floating" || variant === "inset"
240-
? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
240+
? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_16px)]"
241241
: "group-data-[collapsible=icon]:w-[--sidebar-width-icon]",
242242
)}
243243
/>
@@ -249,7 +249,7 @@ const Sidebar = React.forwardRef<
249249
: "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
250250
// Adjust the padding for floating and inset variants.
251251
variant === "floating" || variant === "inset"
252-
? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
252+
? "p-[8px] group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_18px)]"
253253
: "group-data-[collapsible=icon]:w-[--sidebar-width-icon]",
254254
className,
255255
)}

‎desktop/tests/e2e/profile.spec.ts‎

Lines changed: 55 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -346,40 +346,67 @@ test("supports webview zoom keyboard shortcuts", async ({ page }) => {
346346
await page.goto("/");
347347
await expect(page.getByTestId("chat-title")).toHaveText("Home");
348348

349-
await page.keyboard.press(
350-
process.platform === "darwin" ? "Meta+Shift+Equal" : "Control+Shift+Equal",
351-
);
349+
const getTextScaleState = () =>
350+
page.evaluate(() => ({
351+
fontSize: getComputedStyle(document.documentElement).fontSize,
352+
storedScale: localStorage.getItem("sprout:text-scale"),
353+
webviewZoom: window.__SPROUT_E2E_WEBVIEW_ZOOM__,
354+
}));
355+
const dispatchPrimaryShortcut = (
356+
key: string,
357+
code: string,
358+
shiftKey = false,
359+
) =>
360+
page.evaluate(
361+
({ code, key, shiftKey }) => {
362+
const isMac = /mac|iphone|ipad|ipod/i.test(navigator.platform);
363+
window.dispatchEvent(
364+
new KeyboardEvent("keydown", {
365+
bubbles: true,
366+
cancelable: true,
367+
code,
368+
ctrlKey: !isMac,
369+
key,
370+
metaKey: isMac,
371+
shiftKey,
372+
}),
373+
);
374+
},
375+
{ code, key, shiftKey },
376+
);
377+
378+
await dispatchPrimaryShortcut("+", "Equal", true);
379+
380+
await expect.poll(getTextScaleState).toEqual({
381+
fontSize: "17.6px",
382+
storedScale: "1.1",
383+
webviewZoom: 1,
384+
});
352385

353-
await expect
354-
.poll(() => page.evaluate(() => window.__SPROUT_E2E_WEBVIEW_ZOOM__))
355-
.toBe(1.2);
386+
await dispatchPrimaryShortcut("-", "Minus");
356387

357-
await page.keyboard.press(
358-
process.platform === "darwin" ? "Meta+Minus" : "Control+Minus",
359-
);
388+
await expect.poll(getTextScaleState).toEqual({
389+
fontSize: "16px",
390+
storedScale: null,
391+
webviewZoom: 1,
392+
});
360393

361-
await expect
362-
.poll(() => page.evaluate(() => window.__SPROUT_E2E_WEBVIEW_ZOOM__))
363-
.toBe(1);
394+
await dispatchPrimaryShortcut("+", "Equal", true);
395+
await dispatchPrimaryShortcut("+", "Equal", true);
364396

365-
await page.keyboard.press(
366-
process.platform === "darwin" ? "Meta+Shift+Equal" : "Control+Shift+Equal",
367-
);
368-
await page.keyboard.press(
369-
process.platform === "darwin" ? "Meta+Shift+Equal" : "Control+Shift+Equal",
370-
);
371-
372-
await expect
373-
.poll(() => page.evaluate(() => window.__SPROUT_E2E_WEBVIEW_ZOOM__))
374-
.toBe(1.4);
397+
await expect.poll(getTextScaleState).toEqual({
398+
fontSize: "19.2px",
399+
storedScale: "1.2",
400+
webviewZoom: 1,
401+
});
375402

376-
await page.keyboard.press(
377-
process.platform === "darwin" ? "Meta+Digit0" : "Control+Digit0",
378-
);
403+
await dispatchPrimaryShortcut("0", "Digit0");
379404

380-
await expect
381-
.poll(() => page.evaluate(() => window.__SPROUT_E2E_WEBVIEW_ZOOM__))
382-
.toBe(1);
405+
await expect.poll(getTextScaleState).toEqual({
406+
fontSize: "16px",
407+
storedScale: null,
408+
webviewZoom: 1,
409+
});
383410
});
384411

385412
test("shows doctor checks for local sprout tooling", async ({ page }) => {

0 commit comments

Comments
 (0)