klinsmaya/workdsh
1
0
Fork 0
mirror of https://gh-proxy.org/https://github.com/klinsmaya/workdsh.git synced 2026-11-09 01:47:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #577 from anywhere-labs/codex/fix-desktop-dialog-content-size

Browse Source 
fix(desktop): size dialogs by content area
This commit is contained in:
t4we fan
2026-08-25 01:13:17 +08:00
committed by GitHub
parent 1b6e8655de dc9f2ef8ce
commit efc72d4fa8
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dsh-plugin-desktop/src/desktop-dialog-window.ts
+9 -4
View File
@@ -155,11 +155,16 @@ export class DesktopDialogWindow {
}
const renderedHeight = parseDesktopDialogLayout(href)
if (renderedHeight === undefined || window.isDestroyed()) return
const bounds = window.getBounds()
const previousBounds = window.getBounds()
// The renderer reports web-content height. setBounds() consumes the
// outer window height and clips the footer wherever native chrome or
// invisible window borders consume part of that space.
window.setContentSize(DIALOG_WIDTH, renderedHeight, false)
const sizedBounds = window.getBounds()
window.setBounds({
...bounds,
y: bounds.y + Math.round((bounds.height - renderedHeight) / 2),
height: renderedHeight,
...sizedBounds,
x: previousBounds.x + Math.round((previousBounds.width - sizedBounds.width) / 2),
y: previousBounds.y + Math.round((previousBounds.height - sizedBounds.height) / 2),
}, false)
layoutReady = true
if (documentReady) reveal()
dsh-plugin-desktop/tests/desktop-dialog-window.spec.ts
+7 -1
View File
@@ -22,6 +22,11 @@ const electron = vi.hoisted(() => {
private bounds: Electron.Rectangle
readonly getBounds = vi.fn(() => ({ ...this.bounds }))
readonly setBounds = vi.fn((bounds: Electron.Rectangle) => { this.bounds = { ...bounds } })
readonly setContentSize = vi.fn((width: number, height: number) => {
// Model native/invisible chrome so the test distinguishes content size
// from outer bounds instead of accidentally treating them as identical.
this.bounds = { ...this.bounds, width: width + 8, height: height + 12 }
})
readonly loadFile = vi.fn(async () => {})
readonly once = vi.fn((event: string, listener: Listener) => { this.onceListeners.set(event, listener) })
readonly on = vi.fn((event: string, listener: Listener) => { this.listeners.set(event, listener) })
@@ -102,7 +107,8 @@ describe('DesktopDialogWindow', () => {
const layoutEvent = { preventDefault: vi.fn() }
navigate?.(layoutEvent, 'dsh-desktop-dialog://layout?height=236')
expect(layoutEvent.preventDefault).toHaveBeenCalledOnce()
expect(window?.setBounds).toHaveBeenCalledWith({ x: 0, y: 32, width: 480, height: 236 }, false)
expect(window?.setContentSize).toHaveBeenCalledWith(480, 236, false)
expect(window?.setBounds).toHaveBeenCalledWith({ x: -4, y: 26, width: 488, height: 248 }, false)
expect(window?.show).toHaveBeenCalledOnce()
const event = { preventDefault: vi.fn() }
navigate?.(event, 'dsh-desktop-dialog://response?id=0')