Puranjay Savar Mattas
d1ed52b825
Settings now swaps the actual app sidebar's content (search field, collections tree, account footer) for a section list, instead of SettingsView drawing its own nested sidebar inside the detail pane. Done, wherever it's triggered from, restores the collections tree and detail content exactly as they were. AppNavigation gains selectedSettingsSection (and the SettingsSection enum moves there, shared by the new list and the sidebar host) so the sidebar's list and the detail pane agree on which section is showing. Also deferred the profile menu's "Settings…" action by one runloop tick — setting isShowingSettings synchronously in the same call that dismisses the popover was very likely the source of the AppKit "CA commit" transaction warnings in the console.
42 lines
1.2 KiB
Swift
42 lines
1.2 KiB
Swift
#if os(macOS)
|
|
import SwiftUI
|
|
|
|
/// Swapped into the real sidebar's content slot (search field, collections
|
|
/// tree, account footer) while Settings is open — same sidebar, different
|
|
/// content, rather than a separate mini sidebar nested inside a page. "Done"
|
|
/// clears `AppNavigation.isShowingSettings`, which puts the collections tree
|
|
/// back.
|
|
struct SettingsSidebarList: View {
|
|
@Binding var selection: SettingsSection?
|
|
let onDone: () -> Void
|
|
|
|
var body: some View {
|
|
VStack(spacing: 0) {
|
|
HStack {
|
|
Text("Settings")
|
|
.font(.headline)
|
|
Spacer()
|
|
}
|
|
.padding(.horizontal, 16)
|
|
.padding(.vertical, 12)
|
|
|
|
Divider()
|
|
|
|
List(SettingsSection.allCases, selection: $selection) { section in
|
|
Label(section.title, systemImage: section.icon)
|
|
.tag(section)
|
|
}
|
|
.listStyle(.sidebar)
|
|
|
|
Divider()
|
|
|
|
Button("Done", action: onDone)
|
|
.keyboardShortcut(.cancelAction)
|
|
.buttonStyle(.borderedProminent)
|
|
.frame(maxWidth: .infinity)
|
|
.padding(12)
|
|
}
|
|
}
|
|
}
|
|
#endif
|