Skip to content

Commit eaa3de7

Browse files
committed
Squashed commit of the following:
commit 6218d89 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Thu Sep 4 10:09:23 2025 -0500 Revert Project File Changes commit 46f4e36 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Tue Sep 2 14:41:03 2025 -0500 Toolbar Opacity commit 79b49b3 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Fri Aug 29 16:45:12 2025 -0500 Correct Arrow Edge in Scheme Popover commit c2e7e70 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Fri Aug 29 16:37:39 2025 -0500 fix:lint commit 9408577 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Fri Aug 29 16:36:26 2025 -0500 Remove Unified Style (and fix the rabbit hole of bugs that caused) commit 22b5b93 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Fri Aug 29 12:38:53 2025 -0500 Adjust Task Notification View commit c7c30af Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Fri Aug 29 11:58:05 2025 -0500 Update Popover Style commit bc152a0 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Fri Aug 29 11:37:46 2025 -0500 Use new WelcomeWindow Release commit 45aa64c Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Fri Aug 29 11:32:43 2025 -0500 Finish Activity Viewer Pills commit 7e50ff9 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Thu Aug 28 16:22:32 2025 -0500 Adjust Branch Picker and Scheme Dropdown commit f39c497 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Thu Aug 28 16:22:17 2025 -0500 Fix Warning commit a4c879f Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Thu Aug 28 16:22:11 2025 -0500 Add Start/Stop Task Toolbar Group commit 9d74f8a Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Thu Aug 28 16:21:33 2025 -0500 Fix Concurrency Issues commit 1d590a9 Author: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Thu Aug 28 16:20:58 2025 -0500 Update Project, Use local WelcomeWindow for now
1 parent 2236d0d commit eaa3de7

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

CodeEdit/Features/Documents/Controllers/CodeEditSplitViewController.swift

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

22-
private weak var navigatorItem: NSSplitViewItem?
23-
2422
// MARK: - Initialization
2523

2624
init(
@@ -68,7 +66,6 @@ final class CodeEditSplitViewController: NSSplitViewController {
6866
.environmentObject(editorManager)
6967
})
7068

71-
self.navigatorItem = navigator
7269
addSplitViewItem(navigator)
7370

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

125122
guard let workspace else { return }
126123

127-
workspace.notificationPanel.updateToolbarItem()
128-
129124
let navigatorWidth = workspace.getFromWorkspaceState(.splitViewWidth) as? CGFloat
130125
splitView.setPosition(navigatorWidth ?? Self.minSidebarWidth, ofDividerAt: 0)
131126

@@ -141,6 +136,7 @@ final class CodeEditSplitViewController: NSSplitViewController {
141136
) as? Bool ?? true
142137
}
143138

139+
workspace.notificationPanel.updateToolbarItem()
144140
}
145141

146142
// MARK: - NSSplitViewDelegate
@@ -204,14 +200,8 @@ final class CodeEditSplitViewController: NSSplitViewController {
204200
}
205201

206202
if resizedDivider == 0 {
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-
}
203+
let panel = splitView.subviews[0]
204+
let width = panel.frame.size.width
215205
if width > 0 {
216206
workspace?.addToWorkspaceState(key: .splitViewWidth, value: width)
217207
}

0 commit comments

Comments
 (0)