Merge pull request #499 from XcodesOrg/matt/498-fix-nav-close-stucks

fix: adds back in sidebar toggle button so users don't get stuck
This commit is contained in:
Matt Kiazyk 2024-02-16 09:09:01 -06:00 committed by GitHub
commit 91f75843da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions

View file

@ -26,18 +26,20 @@ struct NavigationSplitViewWrapper<Sidebar, Detail>: View where Sidebar: View, De
if #available(macOS 14, *) {
sidebar
.toolbar(removing: .sidebarToggle)
.navigationSplitViewColumnWidth(min: 250, ideal: 300)
} else {
sidebar
}
} detail: {
detail
}
.navigationSplitViewStyle(.balanced)
} else {
// Alternative code for earlier versions of OS.
NavigationView {
// The first column is the sidebar.
sidebar
.frame(minWidth: 250)
detail
}
.navigationViewStyle(.columns)

View file

@ -20,7 +20,6 @@ struct MainWindow: View {
var body: some View {
NavigationSplitViewWrapper {
XcodeListView(selectedXcodeID: $selectedXcodeID, searchText: searchText, category: category, isInstalledOnly: isInstalledOnly)
.frame(minWidth: 250)
.layoutPriority(1)
.alert(item: $appState.xcodeBeingConfirmedForUninstallation) { xcode in
Alert(title: Text(String(format: localizeString("Alert.Uninstall.Title"), xcode.description)),