ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Fix picker arrows and Escape being lost to the window

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-21 12:17:55 -07:00
parent 500e43edd1
commit 779d40008c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac/Sources/Byre/Dialogs.swift
+11 -2
View File
@@ -60,6 +60,8 @@ final class Overlays {
@ObservationIgnored weak var window: NSWindow?
@ObservationIgnored private var monitor: Any?
@ObservationIgnored private var mouseMonitor: Any?
@ObservationIgnored private var holders = 0
@ObservationIgnored private var ctrl: @MainActor (String) -> Bool = { _ in false }
var isOpen: Bool {
!alerts.isEmpty || image != nil || menu != nil || modal != nil || switcher != nil
@@ -131,6 +133,8 @@ final class Overlays {
}
func install(_ ctrl: @escaping @MainActor (String) -> Bool) {
holders += 1
self.ctrl = ctrl
if monitor != nil {
return
}
@@ -143,7 +147,7 @@ final class Overlays {
guard let self, let window = self.window, win == ObjectIdentifier(window) else {
return false
}
return self.key(event, code, flags, chars, ctrl)
return self.key(event, code, flags, chars)
}
return taken ? nil : event
}
@@ -158,7 +162,7 @@ final class Overlays {
}
}
private func key(_ event: NSEvent, _ code: UInt16, _ flags: NSEvent.ModifierFlags, _ chars: String, _ ctrl: @MainActor (String) -> Bool) -> Bool {
private func key(_ event: NSEvent, _ code: UInt16, _ flags: NSEvent.ModifierFlags, _ chars: String) -> Bool {
if !dialogOpen && flags.contains(.control) && !flags.contains(.command) && goKeys.contains(chars) {
return ctrl(chars)
}
@@ -213,6 +217,11 @@ final class Overlays {
}
func uninstall() {
holders -= 1
if holders > 0 {
return
}
ctrl = { _ in false }
if let monitor {
NSEvent.removeMonitor(monitor)
}