From bdd9f7f489447cf2be9d091cb6d8ef0b9058dc5c Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Tue, 21 Apr 2026 03:37:29 +0200 Subject: [PATCH] Tighten Sidebar settings for macOS Drop the redundant inner NavigationStack on non-tvOS (the outer detail pane already provides one) and apply .listStyle(.inset) on macOS. Kept as List to preserve drag-to-reorder for the main navigation section. --- .../Views/Settings/SidebarSettingsView.swift | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/Yattee/Views/Settings/SidebarSettingsView.swift b/Yattee/Views/Settings/SidebarSettingsView.swift index a9c1d2ff..5737c72c 100644 --- a/Yattee/Views/Settings/SidebarSettingsView.swift +++ b/Yattee/Views/Settings/SidebarSettingsView.swift @@ -125,32 +125,40 @@ struct SidebarSettingsView: View { } var body: some View { + #if os(tvOS) NavigationStack { - List { - startupSection - mainNavigationSection - sourcesSection - channelsSection - playlistsSection - } - #if os(iOS) - .environment(\.editMode, .constant(.active)) - #endif - #if !os(tvOS) - .navigationTitle(String(localized: "settings.sidebar.title")) - #endif - #if os(iOS) - .navigationBarTitleDisplayMode(.inline) - #endif - .onAppear { - loadMainNavigationSettings() - } + sidebarList } - #if os(macOS) - .frame(minWidth: 400, minHeight: 300) + #else + sidebarList #endif } + private var sidebarList: some View { + List { + startupSection + mainNavigationSection + sourcesSection + channelsSection + playlistsSection + } + #if os(iOS) + .environment(\.editMode, .constant(.active)) + #endif + #if os(macOS) + .listStyle(.inset) + #endif + #if !os(tvOS) + .navigationTitle(String(localized: "settings.sidebar.title")) + #endif + #if os(iOS) + .navigationBarTitleDisplayMode(.inline) + #endif + .onAppear { + loadMainNavigationSettings() + } + } + // MARK: - Startup Section private var startupSection: some View {