refactor(inspector): grow the window via NSSplitViewItem.collapseBehavior instead of custom min-size code

Author: datlechin

CHANGELOG.md

@@ -48,7 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Find Next (Cmd+G) and Find Previous (Cmd+Shift+G) now work in the editor.
 - Pagination buttons no longer fire their page shortcut twice.
 - Running a PostgreSQL script with a `DO $$ ... $$` block or a dollar-quoted function body no longer fails with an unterminated dollar-quoted string error. (#1559)
-- Toggling the right inspector in a narrow editor window now updates the window minimum width from the visible split panes, so the inspector no longer squeezes content or overflows.
+- Toggling the right inspector in a narrow editor window now grows the window to fit, so the inspector no longer squeezes content or overflows.
 - AWS IAM connections no longer ask for a password on connect or reconnect. IAM supplies the credentials, so the prompt was never needed. The same now holds for any auth mode that replaces the password, such as a Postgres password file.
 - Oracle connection failures show the listener's actual reason (such as an unknown service name) instead of a generic "server closed the connection" message. (#483)
 

TablePro/Core/Services/Infrastructure/MainSplitViewController.swift

@@ -191,6 +191,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         sidebarSplitItem.canCollapse = true
         sidebarSplitItem.minimumThickness = 280
         sidebarSplitItem.maximumThickness = 600
+        sidebarSplitItem.collapseBehavior = .preferResizingSplitViewWithFixedSiblings
         addSplitViewItem(sidebarSplitItem)
 
         detailHosting = NSHostingController(rootView: AnyView(buildDetailView()))
@@ -212,6 +213,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         inspectorSplitItem.canCollapse = true
         inspectorSplitItem.minimumThickness = 270
         inspectorSplitItem.maximumThickness = 400
+        inspectorSplitItem.collapseBehavior = .preferResizingSplitViewWithFixedSiblings
         addSplitViewItem(inspectorSplitItem)
 
         if currentSession?.driver == nil {
@@ -225,97 +227,18 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         inspectorSplitItem.isCollapsed = !inspectorPresented
     }
 
-    override func splitViewDidResizeSubviews(_ notification: Notification) {
-        super.splitViewDidResizeSubviews(notification)
-        recomputeWindowMinimumSize()
-    }
-
     private func materializeInspectorIfNeeded() {
         guard !hasMaterializedInspector, let inspectorHosting else { return }
         hasMaterializedInspector = true
         inspectorHosting.rootView = AnyView(buildInspectorView())
     }
 
-    internal struct PaneMinimum {
-        internal let minimumThickness: CGFloat
-        internal let isCollapsed: Bool
-    }
-
-    internal static func resolvedContentMinSize(
-        base: NSSize,
-        panes: [PaneMinimum],
-        dividerThickness: CGFloat
-    ) -> NSSize {
-        let visiblePanes = panes.filter { !$0.isCollapsed }
-        let paneWidth = visiblePanes.reduce(CGFloat.zero) { partialResult, pane in
-            partialResult + max(CGFloat.zero, pane.minimumThickness)
-        }
-        let dividerCount = max(visiblePanes.count - 1, 0)
-        let resolvedWidth = max(base.width, paneWidth + (CGFloat(dividerCount) * dividerThickness))
-        return NSSize(width: resolvedWidth, height: base.height)
-    }
-
-    private func recomputeWindowMinimumSize(
-        sidebarCollapsed: Bool? = nil,
-        inspectorCollapsed: Bool? = nil
-    ) {
-        guard let window = view.window else { return }
-
-        let resolvedMinSize = Self.resolvedContentMinSize(
-            base: NSSize(width: Self.baseContentMinWidth, height: Self.baseContentMinHeight),
-            panes: [
-                PaneMinimum(
-                    minimumThickness: sidebarSplitItem?.minimumThickness ?? .zero,
-                    isCollapsed: sidebarCollapsed ?? (sidebarSplitItem?.isCollapsed ?? true)
-                ),
-                PaneMinimum(
-                    minimumThickness: detailSplitItem?.minimumThickness ?? .zero,
-                    isCollapsed: detailSplitItem?.isCollapsed ?? false
-                ),
-                PaneMinimum(
-                    minimumThickness: inspectorSplitItem?.minimumThickness ?? .zero,
-                    isCollapsed: inspectorCollapsed ?? (inspectorSplitItem?.isCollapsed ?? true)
-                )
-            ],
-            dividerThickness: splitView.dividerThickness
-        )
-
-        if window.contentMinSize != resolvedMinSize {
-            window.contentMinSize = resolvedMinSize
-        }
-
-        let currentContentSize = window.contentRect(forFrameRect: window.frame).size
-        guard currentContentSize.width < resolvedMinSize.width || currentContentSize.height < resolvedMinSize.height else { return }
-        window.setContentSize(NSSize(
-            width: max(currentContentSize.width, resolvedMinSize.width),
-            height: max(currentContentSize.height, resolvedMinSize.height)
-        ))
-    }
-
-    private func setCollapsed(
-        _ isCollapsed: Bool,
-        for splitItem: NSSplitViewItem?,
-        prepareWindowMinimumSize: (() -> Void)? = nil
-    ) {
-        guard let splitItem else { return }
-
-        if splitItem.isCollapsed == isCollapsed {
-            recomputeWindowMinimumSize()
-            return
-        }
-
-        prepareWindowMinimumSize?()
-
-        guard view.window?.isVisible == true else {
-            splitItem.isCollapsed = isCollapsed
-            recomputeWindowMinimumSize()
-            return
-        }
-
-        NSAnimationContext.runAnimationGroup { _ in
+    private func setCollapsed(_ isCollapsed: Bool, for splitItem: NSSplitViewItem?) {
+        guard let splitItem, splitItem.isCollapsed != isCollapsed else { return }
+        if view.window?.isVisible == true {
             splitItem.animator().isCollapsed = isCollapsed
-        } completionHandler: { [weak self] in
-            self?.recomputeWindowMinimumSize()
+        } else {
+            splitItem.isCollapsed = isCollapsed
         }
     }
 
@@ -340,7 +263,6 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         }
 
         installObservers()
-        recomputeWindowMinimumSize()
         window.recalculateKeyViewLoop()
     }
 
@@ -435,10 +357,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         }
 
         let collapseSidebar = newSession.driver == nil
-        setCollapsed(collapseSidebar, for: sidebarSplitItem) { [weak self] in
-            guard !collapseSidebar else { return }
-            self?.recomputeWindowMinimumSize(sidebarCollapsed: false)
-        }
+        setCollapsed(collapseSidebar, for: sidebarSplitItem)
         rebuildPanes()
     }
 
@@ -604,16 +523,12 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
     func showInspector() {
         materializeInspectorIfNeeded()
-        setCollapsed(false, for: inspectorSplitItem) { [weak self] in
-            self?.recomputeWindowMinimumSize(inspectorCollapsed: false)
-        }
+        setCollapsed(false, for: inspectorSplitItem)
         UserDefaults.standard.set(true, forKey: Self.inspectorPresentedKey)
     }
 
     func hideInspector() {
-        setCollapsed(true, for: inspectorSplitItem) { [weak self] in
-            self?.recomputeWindowMinimumSize(inspectorCollapsed: true)
-        }
+        setCollapsed(true, for: inspectorSplitItem)
         UserDefaults.standard.set(false, forKey: Self.inspectorPresentedKey)
     }
 
@@ -640,9 +555,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
         if sidebarSplitItem?.isCollapsed == true {
             sidebarState.selectedSidebarTab = tab
-            setCollapsed(false, for: sidebarSplitItem) { [weak self] in
-                self?.recomputeWindowMinimumSize(sidebarCollapsed: false)
-            }
+            setCollapsed(false, for: sidebarSplitItem)
         } else if sidebarState.selectedSidebarTab == tab {
             setCollapsed(true, for: sidebarSplitItem)
         } else {
@@ -652,7 +565,5 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
     // MARK: - Constants
 
-    internal static let baseContentMinWidth: CGFloat = 720
-    internal static let baseContentMinHeight: CGFloat = 480
     private static let inspectorPresentedKey = "com.TablePro.rightPanel.isPresented"
 }

TablePro/Core/Services/Infrastructure/TabWindowController.swift

@@ -51,6 +51,7 @@ internal final class TabWindowController: NSWindowController, NSWindowDelegate {
             defer: false
         )
         window.identifier = NSUserInterfaceItemIdentifier("main")
+        window.minSize = NSSize(width: 720, height: 480)
         window.isRestorable = AppSettingsStorage.shared.loadGeneral().startupBehavior == .reopenLast
         window.restorationClass = TabWindowRestoration.self
         window.toolbarStyle = .unified