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

Update: Working BetterDisplay Integration

Browse source
This commit is contained in:
Hariharan Mudaliar 2026-03-02 23:49:50 +05:30
commit dd726d6401
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
5 changed files with 547 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

72
DynamicIsland/components/Settings/SettingsView.swift
View file

@ -650,6 +650,7 @@ struct SettingsView: View {
SettingsSearchEntry(tab: .hudAndOSD, title: "Keyboard Backlight OSD", keywords: ["keyboard", "backlight", "osd"], highlightID: SettingsTab.hudAndOSD.highlightID(for: "Keyboard Backlight OSD")),
SettingsSearchEntry(tab: .hudAndOSD, title: "Material", keywords: ["material", "frosted", "liquid", "glass", "solid", "osd"], highlightID: SettingsTab.hudAndOSD.highlightID(for: "Material")),
SettingsSearchEntry(tab: .hudAndOSD, title: "Icon & Progress Color", keywords: ["color", "icon", "white", "black", "gray", "osd"], highlightID: SettingsTab.hudAndOSD.highlightID(for: "Icon & Progress Color")),
SettingsSearchEntry(tab: .hudAndOSD, title: "BetterDisplay integration", keywords: ["betterdisplay", "external", "display", "brightness", "integration", "third party"], highlightID: SettingsTab.hudAndOSD.highlightID(for: "BetterDisplay integration")),
// Media
SettingsSearchEntry(tab: .media, title: "Music Source", keywords: ["media source", "controller"], highlightID: SettingsTab.media.highlightID(for: "Music Source")),
@ -1794,6 +1795,9 @@ private struct HUDAndOSDSettingsView: View {
}
}
}
// BetterDisplay Integration (shared across all HUD variants)
BetterDisplayIntegrationSection()
}
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.background(paneBackgroundColor)
@ -1807,6 +1811,74 @@ private struct HUDAndOSDSettingsView: View {
}
}
// MARK: - BetterDisplay Integration Settings Section
private struct BetterDisplayIntegrationSection: View {
@Default(.enableBetterDisplayIntegration) var enableBetterDisplayIntegration
@ObservedObject private var betterDisplayManager = BetterDisplayManager.shared
private func highlightID(_ title: String) -> String {
SettingsTab.hudAndOSD.highlightID(for: title)
}
var body: some View {
Form {
Section {
HStack {
VStack(alignment: .leading, spacing: 2) {
Text("BetterDisplay")
.font(.system(size: 13, weight: .medium))
Text(betterDisplayManager.isDetected ? "Detected" : "Not detected")
.font(.caption)
.foregroundStyle(betterDisplayManager.isDetected ? .green : .secondary)
}
Spacer()
Toggle("", isOn: $enableBetterDisplayIntegration)
.toggleStyle(.switch)
.labelsHidden()
.disabled(!betterDisplayManager.isDetected)
}
.settingsHighlight(id: highlightID("BetterDisplay integration"))
if !betterDisplayManager.isDetected {
Text("Install [BetterDisplay](https://betterdisplay.pro) to control external display brightness and volume through Atoll's HUD.")
.font(.caption)
.foregroundStyle(.secondary)
} else if enableBetterDisplayIntegration {
Text("BetterDisplay OSD events will be routed through Atoll's active HUD style. Make sure BetterDisplay's OSD integration is enabled in its Settings › Application › Integration.")
.font(.caption)
.foregroundStyle(.secondary)
} else {
Text("Enable to route BetterDisplay's brightness and volume changes through Atoll's HUD instead of the system OSD.")
.font(.caption)
.foregroundStyle(.secondary)
}
if betterDisplayManager.isDetected {
Button {
betterDisplayManager.refreshDetectionStatus()
} label: {
Label("Refresh detection", systemImage: "arrow.clockwise")
.font(.caption)
}
.buttonStyle(.link)
}
} header: {
HStack(spacing: 6) {
Image(systemName: "display.2")
Text("BetterDisplay Integration")
}
} footer: {
Text("When enabled, Atoll listens for OSD notifications from BetterDisplay and displays them using your selected HUD style above. This works alongside the existing media key interception — BetterDisplay handles external display controls while Atoll provides the visual feedback.")
.foregroundStyle(.secondary)
.font(.caption)
}
}
}
}
private struct HUDSelectionCard<Preview: View>: View {
let title: String
let isSelected: Bool