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 Menu bar to make consistent

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-12-20 14:37:07 +05:30
commit 120cd50e0e
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DynamicIsland/components/OSD/VerticalHUDView.swift
View file

@ -203,7 +203,7 @@ struct VerticalHUDView: View {
case .brightness: case .brightness:
return "sun.max.fill" return "sun.max.fill"
case .backlight: case .backlight:
return "keyboard" return state.value >= 0.5 ? "light.max" : "light.min"
default: default:
return "questionmark" return "questionmark"
} }

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

@ -92,7 +92,7 @@ private enum SettingsTab: String, CaseIterable, Identifiable {
case .appearance: return .purple case .appearance: return .purple
case .lockScreen: return .orange case .lockScreen: return .orange
case .media: return .green case .media: return .green
case .devices: return .cyan case .devices: return Color(red: 0.1, green: 0.11, blue: 0.12)
case .timer: return .red case .timer: return .red
case .calendar: return .cyan case .calendar: return .cyan
case .hudAndOSD: return .indigo case .hudAndOSD: return .indigo
@ -260,7 +260,7 @@ struct SettingsView: View {
HStack(spacing: 10) { HStack(spacing: 10) {
sidebarIcon(for: tab) sidebarIcon(for: tab)
Text(tab.title) Text(tab.title)
if tab == .downloads { if tab == .downloads || tab == .hudAndOSD {
Spacer() Spacer()
Text("BETA") Text("BETA")
.font(.system(size: 9, weight: .bold)) .font(.system(size: 9, weight: .bold))
@ -1288,6 +1288,10 @@ private struct HUDAndOSDSettingsView: View {
var id: String { rawValue } var id: String { rawValue }
} }
private var paneBackgroundColor: Color {
Color(nsColor: .controlBackgroundColor)
}
var body: some View { var body: some View {
VStack(spacing: 20) { VStack(spacing: 20) {
HStack(spacing: 16) { HStack(spacing: 16) {
@ -1533,7 +1537,6 @@ private struct HUDAndOSDSettingsView: View {
Text("Dimensions") Text("Dimensions")
} }
} }
.padding(.top, 10)
case .circular: case .circular:
Form { Form {
@ -1578,9 +1581,10 @@ private struct HUDAndOSDSettingsView: View {
Text("Dimensions") Text("Dimensions")
} }
} }
.padding(.top, 10)
} }
} }
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.background(paneBackgroundColor)
.navigationTitle("Controls") .navigationTitle("Controls")
} }
} }
@ -1690,7 +1694,6 @@ private struct DevicesSettingsView: View {
} }
} }
} }
.padding(.top, 10)
.navigationTitle("Devices") .navigationTitle("Devices")
} }
} }