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 keyboard open + sticky outside-click

Browse source
This commit is contained in:
Soham Sharma 2026-04-16 19:36:42 +08:00
commit 0f034b8528
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
DynamicIsland/ContentView.swift
View file

@ -82,6 +82,7 @@ struct ContentView: View {
@Default(.showStandardMediaControls) var showStandardMediaControls
@Default(.externalDisplayStyle) var externalDisplayStyle
@Default(.hideNonNotchUntilHover) var hideNonNotchUntilHover
@Default(.terminalStickyMode) var terminalStickyMode
// Dynamic sizing based on view type and graph count with smooth transitions
var dynamicNotchSize: CGSize {
@ -520,6 +521,7 @@ struct ContentView: View {
currentView: currentViewString
)
}
syncStickyTerminalOutsideClickMonitor()
}
.sensoryFeedback(.alignment, trigger: haptics)
.contextMenu {
@ -546,12 +548,6 @@ struct ContentView: View {
)
.frame(maxHeight: .infinity, alignment: .top)
.environmentObject(privacyManager)
.onChange(of: dynamicNotchSize) { oldSize, newSize in
guard oldSize != newSize else { return }
runAfter(0.1) {
vm.shouldRecheckHover.toggle()
}
}
.background(dragDetector)
.environmentObject(vm)
.environmentObject(webcamManager)
@ -566,6 +562,9 @@ struct ContentView: View {
enqueueMusicControlWindowSync(forceRefresh: true)
startHiddenEdgeHoverPolling()
}
.onChange(of: terminalStickyMode) { _, _ in
syncStickyTerminalOutsideClickMonitor()
}
.onChange(of: vm.notchState) { _, state in
if state == .open {
suppressMusicControlWindowUpdates()
@ -1752,6 +1751,16 @@ struct ContentView: View {
}
}
/// Installs the global outside-click monitor when Terminal + sticky mode are active (e.g. keyboard-opened terminal).
/// Removes the monitor when the tab, sticky setting, or open state no longer applies.
private func syncStickyTerminalOutsideClickMonitor() {
guard vm.notchState == .open, terminalStickyMode, coordinator.currentView == .terminal else {
removeStickyTerminalClickMonitor()
return
}
installStickyTerminalClickMonitor()
}
private func installStickyTerminalClickMonitor() {
guard stickyTerminalClickMonitor == nil else { return }
stickyTerminalClickMonitor = NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseDown]) { [weak vm] _ in