bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix terminal notch lifecycle so open/close, hover, outside-click, focus, and opacity stay consistent.

Browse source 
fix: stabilize terminal notch open/close, focus, and opacity

Improve terminal tab behavior in notch by preventing hover re-open races, keeping outside-click close logic accurate, and reliably restoring terminal opacity/translucency after remounts. Also ensure terminal receives focus on open and resigns cleanly on close so keyboard input and close/open cycles behave consistently.
This commit is contained in:
Soham Sharma 2026-04-24 16:31:45 +08:00
commit f39785f920
5 changed files with 128 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
DynamicIsland/ContentView.swift
View file

@ -507,7 +507,7 @@ struct ContentView: View {
// When sneak peek finishes, check if user is still hovering and open notch if needed
if !sneakPeekShowing {
runAfter(0.2) {
if isHovering && vm.notchState == .closed {
if isHovering && vm.notchState == .closed && !coordinator.isHoverOpenSuppressed {
openNotch()
}
}
@ -1715,6 +1715,7 @@ struct ContentView: View {
guard let vm, let lockScreenManager else { return }
guard !lockScreenManager.isLocked else { return }
guard vm.notchState == .closed else { return }
guard !self.coordinator.isHoverOpenSuppressed else { return }
guard self.isHovering else { return }
guard !self.handleClosedMusicWaveformTapIfNeeded() else { return }
if Defaults[.enableHaptics] {
@ -1766,6 +1767,10 @@ struct ContentView: View {
stickyTerminalClickMonitor = NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseDown]) { [weak vm] _ in
Task { @MainActor in
guard let vm, vm.notchState == .open else { return }
let clickLocation = NSEvent.mouseLocation
if self.isPointInsideNotchWindow(clickLocation) {
return
}
vm.close()
}
}
@ -1818,7 +1823,8 @@ struct ContentView: View {
await MainActor.run {
guard self.vm.notchState == .closed,
self.isHovering,
!self.isSneakPeekVisibleOnCurrentScreen else { return }
!self.isSneakPeekVisibleOnCurrentScreen,
!self.coordinator.isHoverOpenSuppressed else { return }
if shouldFocusTimerTab {
withAnimation(.smooth) {
@ -1843,14 +1849,27 @@ struct ContentView: View {
} else if self.vm.notchState == .open
&& Defaults[.terminalStickyMode]
&& self.coordinator.currentView == .terminal {
// Terminal sticky mode kept the notch open — install a
// global click monitor so a click outside closes it.
self.installStickyTerminalClickMonitor()
// Re-sync monitor state through one code path to avoid
// monitor lifecycle races between hover and state updates.
self.syncStickyTerminalOutsideClickMonitor()
}
}
}
}
}
private func isPointInsideNotchWindow(_ point: CGPoint) -> Bool {
if let appDelegate = AppDelegate.shared {
if Defaults[.showOnAllDisplays] {
return appDelegate.windows.values.contains(where: { $0.frame.contains(point) })
}
if let window = appDelegate.window {
return window.frame.contains(point)
}
}
return NSApp.windows.contains(where: { $0.frame.contains(point) })
}
// Helper function to check if any popovers are active
private func hasAnyActivePopovers() -> Bool {