mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-21 16:18:55 +00:00
39230d1738
alelpoan's fix (emit hermes:zoom:changed after restore) is correct, but the bug's root is duplication: setAndPersistZoomLevel and restorePersistedZoomLevel each independently did setZoomLevel + send, and restore forgot the send. Collapse both (and the lifecycle re-assert) into a single applyZoomLevel() helper in zoom.ts that always applies-then-notifies — the regression can't recur by omitting a send. Replace the source-grep test (which broke on main: the sibling source-assertion pet test it copied was refactored to a behavioral one, dropping the fs/path imports it relied on) with behavioral coverage of the funnel, matching zoom.ts's "unit-testable without booting a BrowserWindow" convention. Co-authored-by: alelpoan <alelpoan@proton.me>
86 lines
2.7 KiB
TypeScript
86 lines
2.7 KiB
TypeScript
/**
|
|
* Pure helpers for window zoom. The main process owns webContents.setZoomLevel,
|
|
* so the menu items, the Ctrl/Cmd shortcuts, and the settings UI all funnel
|
|
* through this one clamped scale. Percent is the user-facing unit (100 = the
|
|
* default size); Chromium's internal unit is the zoom level, where
|
|
* factor = 1.2 ^ level.
|
|
*/
|
|
|
|
export const ZOOM_STORAGE_KEY = 'hermes:desktop:zoomLevel'
|
|
|
|
const ZOOM_FACTOR_BASE = 1.2
|
|
const MIN_ZOOM_LEVEL = -9
|
|
const MAX_ZOOM_LEVEL = 9
|
|
|
|
export function clampZoomLevel(value) {
|
|
if (!Number.isFinite(value)) {
|
|
return 0
|
|
}
|
|
|
|
return Math.min(Math.max(value, MIN_ZOOM_LEVEL), MAX_ZOOM_LEVEL)
|
|
}
|
|
|
|
export function zoomLevelToPercent(level) {
|
|
return Math.round(Math.pow(ZOOM_FACTOR_BASE, clampZoomLevel(level)) * 100)
|
|
}
|
|
|
|
export function percentToZoomLevel(percent) {
|
|
if (!Number.isFinite(percent) || percent <= 0) {
|
|
return 0
|
|
}
|
|
|
|
return clampZoomLevel(Math.log(percent / 100) / Math.log(ZOOM_FACTOR_BASE))
|
|
}
|
|
|
|
/**
|
|
* Apply a clamped zoom level to a webContents AND notify the renderer, in that
|
|
* order. Every path that changes zoom (user action, restore-on-load, lifecycle
|
|
* re-assert) funnels through here so the settings UI Scale control can never
|
|
* drift from the actually-applied level — the bug where restore set the level
|
|
* but forgot to emit 'hermes:zoom:changed', leaving the control stuck at 100%.
|
|
* Returns the clamped level so callers can persist it.
|
|
*/
|
|
export function applyZoomLevel(webContents, level) {
|
|
const clamped = clampZoomLevel(level)
|
|
webContents.setZoomLevel(clamped)
|
|
webContents.send('hermes:zoom:changed', { level: clamped, percent: zoomLevelToPercent(clamped) })
|
|
|
|
return clamped
|
|
}
|
|
|
|
// Chromium on Windows can drop webContents zoom when a BrowserWindow is minimized
|
|
// and restored. Re-apply the persisted level on these lifecycle transitions.
|
|
export const ZOOM_REASSERT_WINDOW_EVENTS = ['show', 'restore']
|
|
|
|
export function installZoomReassertOnWindowEvents(win, reassert) {
|
|
if (!win?.on) {
|
|
return
|
|
}
|
|
|
|
for (const event of ZOOM_REASSERT_WINDOW_EVENTS) {
|
|
win.on(event, () => {
|
|
if (win.isDestroyed?.()) {
|
|
return
|
|
}
|
|
|
|
reassert()
|
|
})
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Zoom-wiring decision per window kind. Chat windows (main + session) keep
|
|
* global UI zoom; the pet overlay opts out because it sizes its own OS window
|
|
* to the sprite and inheriting zoom would crop it.
|
|
*
|
|
* Extracted so the "pet opts out, everything else opts in" contract is
|
|
* unit-testable without booting a BrowserWindow or reading source.
|
|
*/
|
|
export const ZOOM_WINDOW_CONFIG = {
|
|
chat: { zoom: true },
|
|
petOverlay: { zoom: false }
|
|
} as const
|
|
|
|
export function zoomWiringForWindowKind(kind) {
|
|
return ZOOM_WINDOW_CONFIG[kind] ?? ZOOM_WINDOW_CONFIG.chat
|
|
}
|