Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #564 from mitchellh/sonoma-fs

Browse Source 
macos: on Sonoma, manually add menu height padding for visible-menu
This commit is contained in:
Mitchell Hashimoto
2023-09-27 18:42:49 -07:00
committed by GitHub
parent dcb25c6aa6 1dab2f9dd3
commit c9b5e27f58
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,8 +118,25 @@ class FullScreenHandler { var previousTabGroup: NSWindowTabGroup?
func calculateFullscreenFrame(screenFrame: NSRect, subtractMenu: Bool)->NSRect { func calculateFullscreenFrame(screenFrame: NSRect, 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
if #available(macOS 14, *) {
// Sonoma appears to return the menuBarHeight without including the
// padding around it (that was added in macOS 14). I've reported this
// bug as FB13210000. Until that is fixed, we just hardcode this value
// that I measured using the screenshot tool. I don't know if the
// padding can be changed in any way or if there is a way to get it
// via API but I could not find a solution.
padding = 13
}
return NSMakeRect(
screenFrame.minX,
screenFrame.minY,
screenFrame.width,
screenFrame.height - (menuHeight + padding)
)
}
} }
return screenFrame return screenFrame
} }