Skip to content

Commit f97b089

Browse files
committed
Fix Navigator Width Bug
1 parent a4e7400 commit f97b089

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

CodeEdit/Features/Documents/Controllers/CodeEditSplitViewController.swift

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ final class CodeEditSplitViewController: NSSplitViewController {
1919
private weak var windowRef: NSWindow?
2020
private unowned var hapticPerformer: NSHapticFeedbackPerformer
2121

22+
private weak var navigatorItem: NSSplitViewItem?
23+
2224
// MARK: - Initialization
2325

2426
init(
@@ -66,6 +68,7 @@ final class CodeEditSplitViewController: NSSplitViewController {
6668
.environmentObject(editorManager)
6769
})
6870

71+
self.navigatorItem = navigator
6972
addSplitViewItem(navigator)
7073

7174
let workspaceView = SettingsInjector {
@@ -121,6 +124,8 @@ final class CodeEditSplitViewController: NSSplitViewController {
121124

122125
guard let workspace else { return }
123126

127+
workspace.notificationPanel.updateToolbarItem()
128+
124129
let navigatorWidth = workspace.getFromWorkspaceState(.splitViewWidth) as? CGFloat
125130
splitView.setPosition(navigatorWidth ?? Self.minSidebarWidth, ofDividerAt: 0)
126131

@@ -136,7 +141,6 @@ final class CodeEditSplitViewController: NSSplitViewController {
136141
) as? Bool ?? true
137142
}
138143

139-
workspace.notificationPanel.updateToolbarItem()
140144
}
141145

142146
// MARK: - NSSplitViewDelegate
@@ -200,8 +204,14 @@ final class CodeEditSplitViewController: NSSplitViewController {
200204
}
201205

202206
if resizedDivider == 0 {
203-
let panel = splitView.subviews[0]
204-
let width = panel.frame.size.width
207+
let width: CGFloat
208+
if #available(macOS 26, *) {
209+
let panel = splitViewItems[0]
210+
width = panel.viewController.view.frame.size.width
211+
} else {
212+
let panel = splitView.subviews[0]
213+
width = panel.frame.size.width
214+
}
205215
if width > 0 {
206216
workspace?.addToWorkspaceState(key: .splitViewWidth, value: width)
207217
}

0 commit comments

Comments
 (0)