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

Merge pull request #336 from StudioKeys/origin/bugfix/ls-timers

Browse source 
Atoll: Fix Timers LS Widget overlapping Music Player
This commit is contained in:
Hariharan Mudaliar 2026-03-13 12:55:09 +05:30 • committed by GitHub
commit 5b2f88c4c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 68 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
DynamicIsland/managers/LockScreenPanelManager.swift
View file

@ -202,6 +202,11 @@ class LockScreenPanelManager {
currentAdditionalHeight = additionalHeight
}
func notifyTimerWidgetFrameChanged(animated: Bool) {
guard panelWindow?.isVisible == true || panelAnimator.isPresented else { return }
applyOffsetAdjustment(animated: animated)
}
func applyOffsetAdjustment(animated: Bool = true) {
guard let screen = currentScreen() else { return }
let screenFrame = screen.frame
@ -266,7 +271,14 @@ class LockScreenPanelManager {
let defaultLowering: CGFloat = -28
let userOffset = CGFloat(Defaults[.lockScreenMusicVerticalOffset])
let clampedOffset = min(max(userOffset, -160), 160)
let originY = baseOriginY + defaultLowering + clampedOffset
var originY = baseOriginY + defaultLowering + clampedOffset
if let timerFrame = LockScreenTimerWidgetPanelManager.shared.latestFrame {
let maxAllowedTop = timerFrame.minY - 12
let maxOriginY = maxAllowedTop - collapsedSize.height
originY = min(originY, maxOriginY)
}
return NSRect(x: originX, y: originY, width: collapsedSize.width, height: collapsedSize.height)
}

13
DynamicIsland/managers/LockScreenTimerWidgetManager.swift
View file

@ -156,6 +156,7 @@ final class LockScreenTimerWidgetPanelManager {
hideTask?.cancel()
hideTask = nil
animator.isPresented = true
LockScreenPanelManager.shared.notifyTimerWidgetFrameChanged(animated: false)
LockScreenReminderWidgetPanelManager.shared.refreshPosition(animated: true)
}
@ -169,6 +170,7 @@ final class LockScreenTimerWidgetPanelManager {
window.orderOut(nil)
hideTask = nil
latestFrame = nil
LockScreenPanelManager.shared.notifyTimerWidgetFrameChanged(animated: true)
LockScreenReminderWidgetPanelManager.shared.refreshPosition(animated: true)
return
}
@ -179,6 +181,7 @@ final class LockScreenTimerWidgetPanelManager {
window?.orderOut(nil)
self?.hideTask = nil
self?.latestFrame = nil
LockScreenPanelManager.shared.notifyTimerWidgetFrameChanged(animated: true)
LockScreenReminderWidgetPanelManager.shared.refreshPosition(animated: true)
}
}
@ -264,19 +267,11 @@ final class LockScreenTimerWidgetPanelManager {
let size = LockScreenTimerWidget.preferredSize
let originX = screen.frame.midX - (size.width / 2)
let defaultLowering: CGFloat = -18
var baseY = screen.frame.midY + 24 + defaultLowering
if let musicFrame = LockScreenPanelManager.shared.latestFrame {
baseY = musicFrame.maxY + 28 + defaultLowering
}
let baseY = screen.frame.midY + 24 + defaultLowering
let offset = CGFloat(clampedTimerOffset())
var originY = baseY + offset
if let musicFrame = LockScreenPanelManager.shared.latestFrame {
originY = max(originY, musicFrame.maxY + 12)
}
if let weatherFrame = LockScreenWeatherPanelManager.shared.latestFrame {
originY = min(originY, weatherFrame.minY - size.height - 20)
} else {

19
DynamicIsland/managers/LockScreenWidgetPreviewManager.swift
View file

@ -444,7 +444,14 @@ private struct LockScreenPreviewScene: View {
let defaultLowering: CGFloat = -28
let userOffset = CGFloat(Defaults[.lockScreenMusicVerticalOffset])
let clampedOffset = min(max(userOffset, -160), 160)
let originY = baseOriginY + defaultLowering + clampedOffset
var originY = baseOriginY + defaultLowering + clampedOffset
if showsTimer {
let maxAllowedTop = timerFrame.minY - 12
let maxOriginY = maxAllowedTop - size.height
originY = min(originY, maxOriginY)
}
return CGRect(x: originX, y: originY, width: size.width, height: size.height)
}
@ -453,19 +460,11 @@ private struct LockScreenPreviewScene: View {
let screenFrame = CGRect(origin: .zero, size: screenSize)
let originX = screenFrame.midX - (size.width / 2)
let defaultLowering: CGFloat = -18
var baseY = screenFrame.midY + 24 + defaultLowering
if showsMediaPanel {
baseY = mediaFrame.maxY + 28 + defaultLowering
}
let baseY = screenFrame.midY + 24 + defaultLowering
let offset = CGFloat(min(max(Defaults[.lockScreenTimerVerticalOffset], -160), 160))
var originY = baseY + offset
if showsMediaPanel {
originY = max(originY, mediaFrame.maxY + 12)
}
if showsWeather {
originY = min(originY, weatherFrame.minY - size.height - 20)
} else {