From 9cb4f243b04d454a101b5f177f7a8281d6dd4c57 Mon Sep 17 00:00:00 2001 From: Matt Kiazyk Date: Tue, 6 Feb 2024 22:05:54 -0600 Subject: [PATCH] fix: adds back in sidebar toggle button so users don't get stuck --- Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift | 4 +++- Xcodes/Frontend/MainWindow.swift | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift b/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift index 928e49a..594c811 100644 --- a/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift +++ b/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift @@ -26,18 +26,20 @@ struct NavigationSplitViewWrapper: 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 index 6bbe1ee..88b301d 100644 --- 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)),