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
XcodesOrg · Feb 16, 2024 · 91f7584 · 91f7584
2 parents 6f0cdc7 + 9cb4f24
commit 91f7584
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift b/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift
@@ -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)

diff --git a/Xcodes/Frontend/MainWindow.swift b/Xcodes/Frontend/MainWindow.swift
@@ -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)),