From 120cd50e0ea891c35e090dfa3c9a943771358ff4 Mon Sep 17 00:00:00 2001 From: Hariharan Mudaliar Date: Sat, 20 Dec 2025 14:37:07 +0530 Subject: [PATCH] Update Menu bar to make consistent --- DynamicIsland/components/OSD/VerticalHUDView.swift | 2 +- .../components/Settings/SettingsView.swift | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/DynamicIsland/components/OSD/VerticalHUDView.swift b/DynamicIsland/components/OSD/VerticalHUDView.swift index 723e4c3..4b6f88f 100644 --- a/DynamicIsland/components/OSD/VerticalHUDView.swift +++ b/DynamicIsland/components/OSD/VerticalHUDView.swift @@ -203,7 +203,7 @@ struct VerticalHUDView: View { case .brightness: return "sun.max.fill" case .backlight: - return "keyboard" + return state.value >= 0.5 ? "light.max" : "light.min" default: return "questionmark" } diff --git a/DynamicIsland/components/Settings/SettingsView.swift b/DynamicIsland/components/Settings/SettingsView.swift index 0accea7..6efbd60 100644 --- a/DynamicIsland/components/Settings/SettingsView.swift +++ b/DynamicIsland/components/Settings/SettingsView.swift @@ -92,7 +92,7 @@ private enum SettingsTab: String, CaseIterable, Identifiable { case .appearance: return .purple case .lockScreen: return .orange 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 .calendar: return .cyan case .hudAndOSD: return .indigo @@ -260,7 +260,7 @@ struct SettingsView: View { HStack(spacing: 10) { sidebarIcon(for: tab) Text(tab.title) - if tab == .downloads { + if tab == .downloads || tab == .hudAndOSD { Spacer() Text("BETA") .font(.system(size: 9, weight: .bold)) @@ -1288,6 +1288,10 @@ private struct HUDAndOSDSettingsView: View { var id: String { rawValue } } + private var paneBackgroundColor: Color { + Color(nsColor: .controlBackgroundColor) + } + var body: some View { VStack(spacing: 20) { HStack(spacing: 16) { @@ -1533,7 +1537,6 @@ private struct HUDAndOSDSettingsView: View { Text("Dimensions") } } - .padding(.top, 10) case .circular: Form { @@ -1578,9 +1581,10 @@ private struct HUDAndOSDSettingsView: View { Text("Dimensions") } } - .padding(.top, 10) } } + .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top) + .background(paneBackgroundColor) .navigationTitle("Controls") } } @@ -1690,7 +1694,6 @@ private struct DevicesSettingsView: View { } } } - .padding(.top, 10) .navigationTitle("Devices") } }