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

HotFix: Lock Screen Widget positioning issue

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-12-10 23:59:11 +05:30
commit 34e435b400
No known key found for this signature in database
GPG key ID: D04F1C2B9194DDFC
4 changed files with 133 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

37
DynamicIsland/managers/LockScreenPanelManager.swift
View file

@ -30,9 +30,12 @@ class LockScreenPanelManager {
private(set) var latestFrame: NSRect?
private let panelAnimator = LockScreenPanelAnimator()
private var hideTask: Task<Void, Never>?
private var screenChangeObserver: NSObjectProtocol?
private var workspaceObservers: [NSObjectProtocol] = []
private init() {
print("[\(timestamp())] LockScreenPanelManager: initialized")
registerScreenChangeObservers()
}
private func timestamp() -> String {
@ -41,6 +44,27 @@ class LockScreenPanelManager {
return formatter.string(from: Date())
}
private func registerScreenChangeObservers() {
screenChangeObserver = NotificationCenter.default.addObserver(
forName: NSApplication.didChangeScreenParametersNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screen-parameters")
}
let workspaceCenter = NSWorkspace.shared.notificationCenter
let wakeObserver = workspaceCenter.addObserver(
forName: NSWorkspace.screensDidWakeNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screens-did-wake")
}
workspaceObservers = [wakeObserver]
}
func showPanel() {
print("[\(timestamp())] LockScreenPanelManager: showPanel")
@ -197,6 +221,19 @@ class LockScreenPanelManager {
}
}
private func handleScreenGeometryChange(reason: String) {
guard let window = panelWindow else { return }
guard window.isVisible || panelAnimator.isPresented else { return }
guard let screen = NSScreen.main else { return }
let screenFrame = screen.frame
collapsedFrame = collapsedFrame(for: screenFrame)
updatePanelSize(expanded: isPanelExpanded, additionalHeight: currentAdditionalHeight, animated: false)
LockScreenTimerWidgetManager.shared.notifyMusicPanelFrameChanged(animated: false)
print("[\(timestamp())] LockScreenPanelManager: realigned window due to \(reason)")
}
private func collapsedFrame(for screenFrame: NSRect) -> NSRect {
let collapsedSize = LockScreenMusicPanel.collapsedSize
let originX = screenFrame.midX - (collapsedSize.width / 2)

33
DynamicIsland/managers/LockScreenReminderWidgetPanelManager.swift
View file

@ -9,12 +9,16 @@ final class LockScreenReminderWidgetPanelManager {
private var window: NSWindow?
private var hasDelegated = false
private var screenChangeObserver: NSObjectProtocol?
private var workspaceObservers: [NSObjectProtocol] = []
var isVisible: Bool {
window?.isVisible == true
}
private init() {}
private init() {
registerScreenChangeObservers()
}
func show(with snapshot: LockScreenReminderWidgetSnapshot) {
render(snapshot: snapshot, makeVisible: true)
@ -130,5 +134,32 @@ final class LockScreenReminderWidgetPanelManager {
return NSRect(x: originX, y: proposedY, width: size.width, height: size.height)
}
private func registerScreenChangeObservers() {
screenChangeObserver = NotificationCenter.default.addObserver(
forName: NSApplication.didChangeScreenParametersNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screen-parameters")
}
let workspaceCenter = NSWorkspace.shared.notificationCenter
let wakeObserver = workspaceCenter.addObserver(
forName: NSWorkspace.screensDidWakeNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screens-did-wake")
}
workspaceObservers = [wakeObserver]
}
private func handleScreenGeometryChange(reason: String) {
guard window?.isVisible == true else { return }
refreshPosition(animated: false)
print("LockScreenReminderWidgetPanelManager: realigned window due to \(reason)")
}
}

33
DynamicIsland/managers/LockScreenTimerWidgetManager.swift
View file

@ -102,8 +102,12 @@ final class LockScreenTimerWidgetPanelManager {
private let animator = LockScreenTimerWidgetAnimator()
private var hideTask: Task<Void, Never>?
private(set) var latestFrame: NSRect?
private var screenChangeObserver: NSObjectProtocol?
private var workspaceObservers: [NSObjectProtocol] = []
private init() {}
private init() {
registerScreenChangeObservers()
}
func showWidget() {
guard let screen = NSScreen.main else { return }
@ -248,4 +252,31 @@ final class LockScreenTimerWidgetPanelManager {
let raw = Defaults[.lockScreenTimerVerticalOffset]
return min(max(raw, -160), 160)
}
private func registerScreenChangeObservers() {
screenChangeObserver = NotificationCenter.default.addObserver(
forName: NSApplication.didChangeScreenParametersNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screen-parameters")
}
let workspaceCenter = NSWorkspace.shared.notificationCenter
let wakeObserver = workspaceCenter.addObserver(
forName: NSWorkspace.screensDidWakeNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screens-did-wake")
}
workspaceObservers = [wakeObserver]
}
private func handleScreenGeometryChange(reason: String) {
guard window?.isVisible == true else { return }
refreshPosition(animated: false)
print("LockScreenTimerWidgetPanelManager: realigned window due to \(reason)")
}
}

33
DynamicIsland/managers/LockScreenWeatherPanelManager.swift
View file

@ -13,8 +13,12 @@ final class LockScreenWeatherPanelManager {
private(set) var latestFrame: NSRect?
private var lastSnapshot: LockScreenWeatherSnapshot?
private var lastContentSize: CGSize?
private var screenChangeObserver: NSObjectProtocol?
private var workspaceObservers: [NSObjectProtocol] = []
private init() {}
private init() {
registerScreenChangeObservers()
}
func show(with snapshot: LockScreenWeatherSnapshot) {
render(snapshot: snapshot, makeVisible: true)
@ -122,4 +126,31 @@ final class LockScreenWeatherPanelManager {
window.setFrame(targetFrame, display: true)
}
}
private func registerScreenChangeObservers() {
screenChangeObserver = NotificationCenter.default.addObserver(
forName: NSApplication.didChangeScreenParametersNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screen-parameters")
}
let workspaceCenter = NSWorkspace.shared.notificationCenter
let wakeObserver = workspaceCenter.addObserver(
forName: NSWorkspace.screensDidWakeNotification,
object: nil,
queue: .main
) { [weak self] _ in
self?.handleScreenGeometryChange(reason: "screens-did-wake")
}
workspaceObservers = [wakeObserver]
}
private func handleScreenGeometryChange(reason: String) {
guard window?.isVisible == true else { return }
refreshPositionForOffsets(animated: false)
print("LockScreenWeatherPanelManager: realigned window due to \(reason)")
}
}