Skip to content

fix: fix macos full window (#1254) #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerob13 merged 1 commit into from
Jan 6, 2026
Merged

fix: fix macos full window (#1254) #1255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion src/main/presenter/windowPresenter/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ export class WindowPresenter implements IWindowPresenter {

const parentWindow = BrowserWindow.fromWebContents(event.sender)
if (!parentWindow || parentWindow.isDestroyed()) return
// On macOS fullscreen, suppress tooltip overlay to keep system traffic lights reachable
if (process.platform === 'darwin' && parentWindow.isFullScreen()) {
return
}

const overlay = this.getOrCreateTooltipOverlay(parentWindow)
if (!overlay) return
Expand Down Expand Up @@ -858,6 +862,8 @@ export class WindowPresenter implements IWindowPresenter {
// 窗口进入全屏
shellWindow.on('enter-full-screen', () => {
console.log(`Window ${windowId} entered fullscreen.`)
// Destroy tooltip overlay while fullscreen so it never blocks system traffic lights
this.destroyTooltipOverlay(windowId)
if (!shellWindow.isDestroyed()) {
shellWindow.webContents.send(WINDOW_EVENTS.WINDOW_ENTER_FULL_SCREEN)
eventBus.sendToMain(WINDOW_EVENTS.WINDOW_ENTER_FULL_SCREEN, windowId)
Expand All @@ -874,6 +880,8 @@ export class WindowPresenter implements IWindowPresenter {
// 窗口退出全屏
shellWindow.on('leave-full-screen', () => {
console.log(`Window ${windowId} left fullscreen.`)
// Recreate tooltip overlay after exiting fullscreen for normal behavior
this.getOrCreateTooltipOverlay(shellWindow)
if (!shellWindow.isDestroyed()) {
shellWindow.webContents.send(WINDOW_EVENTS.WINDOW_LEAVE_FULL_SCREEN)
eventBus.sendToMain(WINDOW_EVENTS.WINDOW_LEAVE_FULL_SCREEN, windowId)
Expand Down Expand Up @@ -994,7 +1002,10 @@ export class WindowPresenter implements IWindowPresenter {
shellWindow.webContents.once('did-finish-load', () => {
if (shellWindow.isDestroyed()) return
shellWindow.webContents.send('shell-window:type', windowType)
this.getOrCreateTooltipOverlay(shellWindow)
// Avoid pre-creating overlay if window already in fullscreen on macOS
if (!(process.platform === 'darwin' && shellWindow.isFullScreen())) {
this.getOrCreateTooltipOverlay(shellWindow)
}
})

// --- 处理初始标签页创建或激活 ---
Expand Down Expand Up @@ -1068,6 +1079,8 @@ export class WindowPresenter implements IWindowPresenter {

private getOrCreateTooltipOverlay(parentWindow: BrowserWindow): BrowserWindow | null {
if (parentWindow.isDestroyed()) return null
// Do not create overlay on macOS fullscreen; it hides traffic lights
if (process.platform === 'darwin' && parentWindow.isFullScreen()) return null

const existing = this.tooltipOverlayWindows.get(parentWindow.id)
if (existing && !existing.isDestroyed()) {
Expand Down Expand Up @@ -1103,6 +1116,11 @@ export class WindowPresenter implements IWindowPresenter {
}
})

if (process.platform === 'darwin') {
overlay.setHiddenInMissionControl(true)
// Keep overlay off fullscreen spaces to avoid covering macOS traffic lights
overlay.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: false })
}
overlay.setIgnoreMouseEvents(true, { forward: true })

const syncOnMoved = () => {
Expand Down