From b77c5634f0ad4e43128ba9c614a743cbd1dcdd37 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 15 Apr 2025 08:52:00 -0700
Subject: [PATCH] macos: quick terminal uses padded notch mode if notch is
 visible

Fixes #6612
---
 .../QuickTerminalController.swift             | 20 ++++++++++++-------
 .../Sources/Helpers/NSScreen+Extension.swift  |  7 +++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift b/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
index 6e5607c6f..1abe30da1 100644
--- a/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
+++ b/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
@@ -495,14 +495,20 @@ class QuickTerminalController: BaseTerminalController {
     private func onToggleFullscreen() {
         // We ignore the configured fullscreen style and always use non-native
         // because the way the quick terminal works doesn't support native.
-        //
-        // 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.
-        let mode: FullscreenMode = if (NSApp.isFrontmost) {
-            .nonNative
+        let mode: FullscreenMode
+        if (NSApp.isFrontmost) {
+            // If we're frontmost and we have a notch then we keep padding
+            // so all lines of the terminal are visible.
+            if (window?.screen?.hasNotch ?? false) {
+                mode = .nonNativePaddedNotch
+            } else {
+                mode = .nonNative
+            }
         } 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)
diff --git a/macos/Sources/Helpers/NSScreen+Extension.swift b/macos/Sources/Helpers/NSScreen+Extension.swift
index ef2c02908..675e0b2ec 100644
--- a/macos/Sources/Helpers/NSScreen+Extension.swift
+++ b/macos/Sources/Helpers/NSScreen+Extension.swift
@@ -34,4 +34,11 @@ extension NSScreen {
 
         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
+    }
 }