Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-17 09:16:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: quick terminal uses padded notch mode if notch is visible (#7098)

Browse Source 
Fixes #6612
This commit is contained in:
Mitchell Hashimoto
2025-04-15 09:04:44 -07:00
committed by GitHub
parent 62af0c0ec0 b77c5634f0
commit 392aab2e4a
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
View File

@ -495,14 +495,20 @@ class QuickTerminalController: BaseTerminalController {
private func onToggleFullscreen() { private func onToggleFullscreen() {
// We ignore the configured fullscreen style and always use non-native // We ignore the configured fullscreen style and always use non-native
// because the way the quick terminal works doesn't support native. // because the way the quick terminal works doesn't support native.
// let mode: FullscreenMode
// An additional detail is that if the is NOT frontmost, then our if (NSApp.isFrontmost) {
// NSApp.presentationOptions will not take effect so we must always // If we're frontmost and we have a notch then we keep padding
// do the visible menu mode since we can't get rid of the menu. // so all lines of the terminal are visible.
let mode: FullscreenMode = if (NSApp.isFrontmost) { if (window?.screen?.hasNotch ?? false) {
.nonNative mode = .nonNativePaddedNotch
} else {
mode = .nonNative
}
} else { } else {
.nonNativeVisibleMenu // An additional detail is that if the is NOT frontmost, then our
// NSApp.presentationOptions will not take effect so we must always
// do the visible menu mode since we can't get rid of the menu.
mode = .nonNativeVisibleMenu
} }
toggleFullscreen(mode: mode) toggleFullscreen(mode: mode)

7
macos/Sources/Helpers/NSScreen+Extension.swift
View File

@ -34,4 +34,11 @@ extension NSScreen {
return visibleFrame.height < (frame.height - max(menuHeight, notchInset) - boundaryAreaPadding) return visibleFrame.height < (frame.height - max(menuHeight, notchInset) - boundaryAreaPadding)
} }
/// Returns true if the screen has a visible notch (i.e., a non-zero safe area inset at the top).
var hasNotch: Bool {
// We assume that a top safe area means notch, since we don't currently
// know any other situation this is true.
return safeAreaInsets.top > 0
}
} }