Fix Inspector toggling (#1192)

* Fixed inspector not toggling

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

* Removed old sidebar command

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

* Fix warning

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

* fix warning

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

---------

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Author: Wouter01

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

@@ -8,16 +8,21 @@
 import Cocoa
 import SwiftUI
 
-final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
+final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, ObservableObject {
     static let minSidebarWidth: CGFloat = 242
 
+    @Published var navigatorCollapsed = false
+    @Published var inspectorCollapsed = false
+
+    var observers: [NSKeyValueObservation] = []
+
     private var prefs: AppPreferencesModel = .shared
 
     var workspace: WorkspaceDocument?
     var quickOpenPanel: OverlayPanel?
     var commandPalettePanel: OverlayPanel?
 
-    private var splitViewController: NSSplitViewController!
+    var splitViewController: NSSplitViewController!
 
     init(window: NSWindow, workspace: WorkspaceDocument) {
         super.init(window: window)
@@ -31,6 +36,15 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
         // This allows us to use some SwiftUI features, like focusedSceneObject.
         contentViewController = NSHostingController(rootView: view)
 
+        observers = [
+            splitViewController.splitViewItems.first!.observe(\.isCollapsed, changeHandler: { [weak self] item, _ in
+                self?.navigatorCollapsed = item.isCollapsed
+            }),
+            splitViewController.splitViewItems.last!.observe(\.isCollapsed, changeHandler: { [weak self] item, _ in
+                self?.navigatorCollapsed = item.isCollapsed
+            })
+        ]
+
         setupToolbar()
         registerCommands()
     }
@@ -298,7 +312,9 @@ extension CodeEditWindowController {
     func toggleLastPanel() {
         guard let lastSplitView = splitViewController.splitViewItems.last else { return }
 
-        if lastSplitView.isCollapsed {
+        if let toolbar = window?.toolbar,
+            lastSplitView.isCollapsed,
+            !toolbar.items.map(\.itemIdentifier).contains(.itemListTrackingSeparator) {
             window?.toolbar?.insertItem(withItemIdentifier: .itemListTrackingSeparator, at: 4)
         }
         NSAnimationContext.runAnimationGroup { _ in

CodeEdit/Features/WindowCommands/CodeEditCommands.swift

@@ -12,7 +12,6 @@ struct CodeEditCommands: Commands {
     var body: some Commands {
         MainCommands()
         FileCommands()
-        SidebarCommands()
         ViewCommands()
         FindCommands()
         NavigateCommands()

CodeEdit/Features/WindowCommands/ViewCommands.swift

@@ -9,6 +9,15 @@ import SwiftUI
 
 struct ViewCommands: Commands {
     private var prefs: AppPreferencesModel = .shared
+    @State var windowController: CodeEditWindowController?
+
+    var navigatorCollapsed: Bool {
+        windowController?.navigatorCollapsed ?? false
+    }
+
+    var inspectorCollapsed: Bool {
+        windowController?.navigatorCollapsed ?? false
+    }
 
     var body: some Commands {
         CommandGroup(after: .toolbar) {
@@ -33,6 +42,23 @@ struct ViewCommands: Commands {
 
             }
             .disabled(true)
+
+            Divider()
+
+            Button("\(navigatorCollapsed ? "Show" : "Hide") Navigator") {
+                windowController?.toggleFirstPanel()
+            }
+            .disabled(windowController == nil)
+            .keyboardShortcut("s", modifiers: [.control, .command])
+            .onReceive(NSApp.publisher(for: \.keyWindow)) { window in
+                windowController = window?.windowController as? CodeEditWindowController
+            }
+
+            Button("\(inspectorCollapsed ? "Show" : "Hide") Inspector") {
+                windowController?.toggleLastPanel()
+            }
+            .disabled(windowController == nil)
+            .keyboardShortcut("i", modifiers: [.control, .command])
         }
     }
 }