mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Update HUDs to show up betterdisplay
This commit is contained in:
parent
dd726d6401
commit
cead5f9ce8
7 changed files with 66 additions and 28 deletions
|
|
@ -174,6 +174,14 @@ class SystemHUDManager {
|
|||
keyboardBacklightEnabled: change.newValue
|
||||
)
|
||||
}.store(in: &cancellables)
|
||||
|
||||
// When BetterDisplay integration toggled, restart observer to update Cmd+Brightness key interception
|
||||
Defaults.publisher(.enableBetterDisplayIntegration, options: []).sink { [weak self] _ in
|
||||
guard let self = self, self.isSetupComplete else { return }
|
||||
Task { @MainActor in
|
||||
await self.startSystemObserver()
|
||||
}
|
||||
}.store(in: &cancellables)
|
||||
}
|
||||
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
|
@ -218,7 +226,7 @@ class SystemHUDManager {
|
|||
// Determine which controls to enable based on HUD or OSD mode
|
||||
let volumeEnabled: Bool
|
||||
let brightnessEnabled: Bool
|
||||
let keyboardBacklightEnabled: Bool
|
||||
var keyboardBacklightEnabled: Bool
|
||||
|
||||
if Defaults[.enableCircularHUD] || Defaults[.enableVerticalHUD] {
|
||||
// Respect per-control toggles so the system HUD can handle disabled events
|
||||
|
|
@ -234,6 +242,12 @@ class SystemHUDManager {
|
|||
brightnessEnabled = Defaults[.enableBrightnessHUD]
|
||||
keyboardBacklightEnabled = Defaults[.enableKeyboardBacklightHUD]
|
||||
}
|
||||
|
||||
// When BetterDisplay integration is on, disable Cmd+Brightness key interception
|
||||
// because BetterDisplay uses Cmd+F1/F2 for its own display controls.
|
||||
if Defaults[.enableBetterDisplayIntegration] {
|
||||
keyboardBacklightEnabled = false
|
||||
}
|
||||
|
||||
changesObserver?.startObserving(
|
||||
volumeEnabled: volumeEnabled,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue