mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-03 16:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #585 from mikdusan/fullscreen

Browse Source 
macos: adjust fullscreen frame height for notch
This commit is contained in:
Mitchell Hashimoto
2023-09-29 12:06:52 -07:00
committed by GitHub
parent 1f5518cd83 f386f12e8a
commit 071a53bb33
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
macos/Sources/Helpers/FullScreenHandler.swift
View File

@@ -93,7 +93,7 @@ class FullScreenHandler { var previousTabGroup: NSWindowTabGroup?
window.styleMask.remove(.titled) window.styleMask.remove(.titled)
// Set frame to screen size, accounting for the menu bar if needed // Set frame to screen size, accounting for the menu bar if needed
let frame = calculateFullscreenFrame(screenFrame: screen.frame, subtractMenu: !hideMenu) let frame = calculateFullscreenFrame(screen: screen, subtractMenu: !hideMenu)
window.setFrame(frame, display: true) window.setFrame(frame, display: true)
// Focus window // Focus window
@@ -116,12 +116,26 @@ class FullScreenHandler { var previousTabGroup: NSWindowTabGroup?
NSApp.presentationOptions.remove(.autoHideDock) NSApp.presentationOptions.remove(.autoHideDock)
} }
func calculateFullscreenFrame(screenFrame: NSRect, subtractMenu: Bool)->NSRect { func calculateFullscreenFrame(screen: NSScreen, subtractMenu: Bool)->NSRect {
if (subtractMenu) { if (subtractMenu) {
let menuHeight = NSApp.mainMenu?.menuBarHeight ?? 0 if let menuHeight = NSApp.mainMenu?.menuBarHeight {
return NSMakeRect(screenFrame.minX, screenFrame.minY, screenFrame.width, screenFrame.height - menuHeight) var padding: CGFloat = 0
// Detect the notch. If there is a safe area on top it includes the
// menu height as a safe area so we also subtract that from it.
if (screen.safeAreaInsets.top > 0) {
padding = screen.safeAreaInsets.top - menuHeight;
}
return NSMakeRect(
screen.frame.minX,
screen.frame.minY,
screen.frame.width,
screen.frame.height - (menuHeight + padding)
)
}
} }
return screenFrame return screen.frame
} }
func leaveFullscreen(window: NSWindow) { func leaveFullscreen(window: NSWindow) {