Skip to content

Commit 8382df6

Browse files
thecoolwinterlukepistrol
authored andcommitted
Add minSidebarWidth constant
1 parent cc82b8f commit 8382df6

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

CodeEdit/Features/Documents/Controllers/CodeEditSplitViewController.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Cocoa
99

10-
fileprivate extension CGFloat {
10+
private extension CGFloat {
1111
static let snapWidth: CGFloat = 272
1212

1313
static let minSnapWidth: CGFloat = snapWidth - 10
@@ -58,22 +58,22 @@ final class CodeEditSplitViewController: NSSplitViewController {
5858
return .snapWidth
5959
} else {
6060
isSnapped = false
61-
if proposedPosition <= 121 {
61+
if proposedPosition <= CodeEditWindowController.minSidebarWidth / 2 {
6262
splitViewItems.first?.isCollapsed = true
6363
return 0
6464
}
65-
return max(242, proposedPosition)
65+
return max(CodeEditWindowController.minSidebarWidth, proposedPosition)
6666
}
6767
} else if dividerIndex == 1 {
6868
let proposedWidth = view.frame.width - proposedPosition
69-
if proposedWidth <= 121 {
69+
if proposedWidth <= CodeEditWindowController.minSidebarWidth / 2 {
7070
splitViewItems.last?.isCollapsed = true
7171
removeToolbarItemIfNeeded()
7272
return proposedPosition
7373
}
7474
splitViewItems.last?.isCollapsed = false
7575
insertToolbarItemIfNeeded()
76-
return min(view.frame.width - 242, proposedPosition)
76+
return min(view.frame.width - CodeEditWindowController.minSidebarWidth, proposedPosition)
7777
}
7878
return proposedPosition
7979
}

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import Cocoa
99
import SwiftUI
1010

1111
final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
12+
static let minSidebarWidth: CGFloat = 242
13+
1214
private var prefs: AppPreferencesModel = .shared
1315

1416
var workspace: WorkspaceDocument?
@@ -73,7 +75,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
7375
sidebarWithViewController: NSHostingController(rootView: navigatorView)
7476
)
7577
navigator.titlebarSeparatorStyle = .none
76-
navigator.minimumThickness = 242
78+
navigator.minimumThickness = Self.minSidebarWidth
7779
navigator.collapseBehavior = .useConstraints
7880
splitVC.addSplitViewItem(navigator)
7981

@@ -92,7 +94,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
9294
viewController: NSHostingController(rootView: inspectorView)
9395
)
9496
inspector.titlebarSeparatorStyle = .none
95-
inspector.minimumThickness = 242
97+
inspector.minimumThickness = Self.minSidebarWidth
9698
inspector.isCollapsed = true
9799
inspector.canCollapse = true
98100
inspector.collapseBehavior = .useConstraints

0 commit comments

Comments
 (0)