|
7 | 7 |
|
8 | 8 | import Cocoa |
9 | 9 |
|
10 | | -private extension CGFloat { |
| 10 | +fileprivate extension CGFloat { |
11 | 11 | static let snapWidth: CGFloat = 272 |
12 | 12 |
|
13 | 13 | static let minSnapWidth: CGFloat = snapWidth - 10 |
@@ -51,12 +51,50 @@ final class CodeEditSplitViewController: NSSplitViewController { |
51 | 51 | constrainSplitPosition proposedPosition: CGFloat, |
52 | 52 | ofSubviewAt dividerIndex: Int |
53 | 53 | ) -> CGFloat { |
54 | | - if (CGFloat.minSnapWidth...CGFloat.maxSnapWidth).contains(proposedPosition) { |
55 | | - isSnapped = true |
56 | | - return .snapWidth |
57 | | - } else { |
58 | | - isSnapped = false |
59 | | - return proposedPosition |
| 54 | + if dividerIndex == 0 { |
| 55 | + // Navigator |
| 56 | + if (CGFloat.minSnapWidth...CGFloat.maxSnapWidth).contains(proposedPosition) { |
| 57 | + isSnapped = true |
| 58 | + return .snapWidth |
| 59 | + } else { |
| 60 | + isSnapped = false |
| 61 | + if proposedPosition <= 121 { |
| 62 | + splitViewItems.first?.isCollapsed = true |
| 63 | + return 0 |
| 64 | + } |
| 65 | + return max(242, proposedPosition) |
| 66 | + } |
| 67 | + } else if dividerIndex == 1 { |
| 68 | + let proposedWidth = view.frame.width - proposedPosition |
| 69 | + if proposedWidth <= 121 { |
| 70 | + splitViewItems.last?.isCollapsed = true |
| 71 | + removeToolbarItemIfNeeded() |
| 72 | + return proposedPosition |
| 73 | + } |
| 74 | + splitViewItems.last?.isCollapsed = false |
| 75 | + insertToolbarItemIfNeeded() |
| 76 | + return min(view.frame.width - 242, proposedPosition) |
| 77 | + } |
| 78 | + return proposedPosition |
| 79 | + } |
| 80 | + |
| 81 | + /// Quick fix for list tracking separator needing to be added again after closing, then opening the inspector with a drag. |
| 82 | + private func insertToolbarItemIfNeeded() { |
| 83 | + guard !( |
| 84 | + view.window?.toolbar?.items.contains(where: { $0.itemIdentifier == .itemListTrackingSeparator }) ?? true |
| 85 | + ) else { |
| 86 | + return |
| 87 | + } |
| 88 | + view.window?.toolbar?.insertItem(withItemIdentifier: .itemListTrackingSeparator, at: 4) |
| 89 | + } |
| 90 | + |
| 91 | + /// Quick fix for list tracking separator needing to be removed after closing the inspector with a drag |
| 92 | + private func removeToolbarItemIfNeeded() { |
| 93 | + guard let index = view.window?.toolbar?.items.firstIndex( |
| 94 | + where: { $0.itemIdentifier == .itemListTrackingSeparator } |
| 95 | + ) else { |
| 96 | + return |
60 | 97 | } |
| 98 | + view.window?.toolbar?.removeItem(at: index) |
61 | 99 | } |
62 | 100 | } |
0 commit comments