Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions apps/code/src/main/zoom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ class FakeWebContents extends EventEmitter {
return this.destroyed;
}

public getZoomLevel(): number {
return this.zoomLevel;
}

public setZoomLevel(level: number): void {
this.setZoomLevelCalls.push(level);
this.zoomLevel = level;
Expand Down Expand Up @@ -96,6 +92,16 @@ describe("window zoom", () => {
expect(window.webContents.zoomLevel).toBe(0.5);
});

it("restores the persisted level after in-page task navigation", () => {
const window = createWindow();
setupWindowZoom(window);
window.webContents.zoomLevel = 0;

window.webContents.emit("did-navigate-in-page");

expect(window.webContents.zoomLevel).toBe(0.5);
});

it("restores the current level after an external window resize", () => {
const window = createWindow();
setupWindowZoom(window);
Expand Down Expand Up @@ -169,29 +175,27 @@ describe("window zoom", () => {
},
);

it("skips redundant restoration during a resize storm", () => {
it("reapplies zoom when Chromium reports the expected level after a visible reset", () => {
const window = createWindow();
setupWindowZoom(window);
window.webContents.zoomLevel = 0.5;

window.emit("resize");
vi.runAllTimers();
vi.advanceTimersByTime(16);
window.emit("resize");
vi.runAllTimers();
const callsBeforeReset = [...window.webContents.setZoomLevelCalls];

window.webContents.zoomLevel = 0;
expect(window.webContents.setZoomLevelCalls).toEqual([0.5]);
});

it("debounces restoration during a resize storm", () => {
const window = createWindow();
setupWindowZoom(window);

window.emit("resize");
window.emit("resize");
window.emit("resized");
vi.runAllTimers();

expect({
callsBeforeReset,
callsAfterReset: window.webContents.setZoomLevelCalls,
}).toEqual({
callsBeforeReset: [],
callsAfterReset: [0.5],
});
expect(window.webContents.setZoomLevelCalls).toEqual([0.5]);
});

it("ignores queued zoom work after the window is destroyed", () => {
Expand Down
13 changes: 8 additions & 5 deletions apps/code/src/main/zoom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ const ZOOM_MIN = -3;
const ZOOM_MAX = 3;

interface ZoomWebContents {
getZoomLevel(): number;
isDestroyed(): boolean;
on(event: "did-finish-load", listener: () => void): void;
on(
event: "did-finish-load" | "did-navigate-in-page",
listener: () => void,
): void;
on(
event: "zoom-changed",
listener: (
Expand Down Expand Up @@ -88,9 +90,7 @@ export function restoreWindowZoom(window: ZoomWindow): void {
runAfterWheelZoom(window, () => {
if (window.webContents.isDestroyed()) return;
const zoomLevel = getCurrentZoomLevel(window);
if (window.webContents.getZoomLevel() !== zoomLevel) {
window.webContents.setZoomLevel(zoomLevel);
}
window.webContents.setZoomLevel(zoomLevel);
});
}

Expand All @@ -113,6 +113,9 @@ export function setupWindowZoom(window: ZoomWindow): void {
};

window.webContents.on("did-finish-load", () => restoreWindowZoom(window));
window.webContents.on("did-navigate-in-page", () =>
restoreWindowZoom(window),
);
window.webContents.on("zoom-changed", (event, zoomDirection) => {
event.preventDefault();
state.wheelZoomDelta += zoomDirection === "in" ? ZOOM_STEP : -ZOOM_STEP;
Expand Down