Skip to content

Commit 26068c6

Browse files
committed
Add Toolbar Visible State to Window Restoration
1 parent 7b205fb commit 26068c6

4 files changed

Lines changed: 5 additions & 13 deletions

File tree

CodeEdit/Features/Documents/Controllers/CodeEditWindowController+Toolbar.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@ extension CodeEditWindowController {
5656

5757
func toggleToolbar() {
5858
toolbarCollapsed.toggle()
59+
workspace?.addToWorkspaceState(key: .toolbarCollapsed, value: toolbarCollapsed)
5960
updateToolbarVisibility()
6061
}
6162

62-
private func updateToolbarVisibility() {
63+
func updateToolbarVisibility() {
6364
if toolbarCollapsed {
6465
window?.titleVisibility = .visible
6566
window?.title = workspace?.workspaceFileManager?.folderUrl.lastPathComponent ?? "Empty"

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
4444
window?.delegate = self
4545
guard let workspace else { return }
4646
self.workspace = workspace
47+
self.toolbarCollapsed = workspace.getFromWorkspaceState(.toolbarCollapsed) as? Bool ?? false
4748
guard let splitViewController = setupSplitView(with: workspace) else {
4849
fatalError("Failed to set up content view.")
4950
}
@@ -73,6 +74,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
7374
]
7475

7576
setupToolbar()
77+
updateToolbarVisibility()
7678
registerCommands()
7779
}
7880

CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceStateKey.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ enum WorkspaceStateKey: String {
1414
case splitViewWidth
1515
case navigatorCollapsed
1616
case inspectorCollapsed
17+
case toolbarCollapsed
1718
}

CodeEdit/Features/StatusBar/Views/StatusBarItems/StatusBarToggleUtilityAreaButton.swift

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ internal struct StatusBarToggleUtilityAreaButton: View {
3131
id: "open.drawer",
3232
command: { [weak utilityAreaViewModel] in utilityAreaViewModel?.togglePanel() }
3333
)
34-
CommandManager.shared.addCommand(
35-
name: "Toggle Utility Area Without Animation",
36-
title: "Toggle Utility Area Without Animation",
37-
id: "open.drawer.no.animation",
38-
command: { [weak utilityAreaViewModel] in utilityAreaViewModel?.togglePanel(animation: false) }
39-
)
4034
}
4135
}
4236
.onAppear {
@@ -46,12 +40,6 @@ internal struct StatusBarToggleUtilityAreaButton: View {
4640
id: "open.drawer",
4741
command: { [weak utilityAreaViewModel] in utilityAreaViewModel?.togglePanel() }
4842
)
49-
CommandManager.shared.addCommand(
50-
name: "Toggle Utility Area Without Animation",
51-
title: "Toggle Utility Area Without Animation",
52-
id: "open.drawer.no.animation",
53-
command: { [weak utilityAreaViewModel] in utilityAreaViewModel?.togglePanel(animation: false) }
54-
)
5543
}
5644
}
5745
}

0 commit comments

Comments
 (0)