Keep Escape from leaving full screen in the main window

2026-10-20 08:33:29 -07:00
parent 0584535d34
commit baa048a89e
2 changed files with 9 additions and 6 deletions
@@ -161,15 +161,18 @@ final class Overlays {
        if !dialogOpen && flags.contains(.control) && !flags.contains(.command) && goKeys.contains(chars) {
            return ctrl(chars)
        }
+        let marked = (NSApp.keyWindow?.firstResponder as? NSTextView)?.hasMarkedText() ?? false
+        if code == 53 {
+            if isOpen {
+                closeTop()
+                return true
+            }
+            return !marked && !terminalFocused()
+        }
        if !isOpen {
            return false
        }
-        if code == 53 {
-            closeTop()
-            return true
-        }
        let enter = code == 36 || code == 76
-        let marked = (NSApp.keyWindow?.firstResponder as? NSTextView)?.hasMarkedText() ?? false
        if !alerts.isEmpty {
            if enter {
                alerts.removeLast()