Fix for background color of toolbar in inspector (#1155)

* Fix for background color of toolbar in inspector

Signed-off-by: Wouter01 <[email protected]>

* Fixed warning

Signed-off-by: Wouter01 <[email protected]>

* renamed fixInspectorToolbarBackground to hideInspectorToolbarBackground

Signed-off-by: Wouter01 <[email protected]>

---------

Signed-off-by: Wouter01 <[email protected]>

Author: Wouter01

CodeEdit/Features/Documents/Controllers/CodeEditSplitViewController.swift

@@ -85,6 +85,7 @@ final class CodeEditSplitViewController: NSSplitViewController {
 
     override func viewDidAppear() {
         viewIsReady = true
+        hideInspectorToolbarBackground()
     }
 
     // MARK: - NSSplitViewDelegate
@@ -163,4 +164,15 @@ final class CodeEditSplitViewController: NSSplitViewController {
         }
         view.window?.toolbar?.removeItem(at: index)
     }
+
+    func hideInspectorToolbarBackground() {
+        let controller = self.view.window?.perform(Selector(("titlebarViewController"))).takeUnretainedValue()
+        if let controller = controller as? NSViewController {
+            let effectViewCount = controller.view.subviews.filter { $0 is NSVisualEffectView }.count
+            guard effectViewCount > 2 else { return }
+            if let view = controller.view.subviews[0] as? NSVisualEffectView {
+                view.isHidden = true
+            }
+        }
+    }
 }

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

@@ -110,6 +110,8 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
         inspector.isCollapsed = true
         inspector.canCollapse = true
         inspector.collapseBehavior = .useConstraints
+        inspector.isSpringLoaded = true
+
         splitVC.addSplitViewItem(inspector)
 
         self.splitViewController = splitVC
@@ -222,27 +224,6 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
         super.windowDidLoad()
     }
 
-    @objc func toggleFirstPanel() {
-        guard let firstSplitView = splitViewController.splitViewItems.first else { return }
-        firstSplitView.animator().isCollapsed.toggle()
-        if let codeEditSplitVC = splitViewController as? CodeEditSplitViewController {
-            codeEditSplitVC.saveNavigatorCollapsedState(isCollapsed: firstSplitView.isCollapsed)
-        }
-    }
-
-    @objc func toggleLastPanel() {
-        guard let lastSplitView = splitViewController.splitViewItems.last else { return }
-        lastSplitView.animator().isCollapsed.toggle()
-        if lastSplitView.isCollapsed {
-            window?.toolbar?.removeItem(at: 4)
-        } else {
-            window?.toolbar?.insertItem(withItemIdentifier: .itemListTrackingSeparator, at: 4)
-        }
-        if let codeEditSplitVC = splitViewController as? CodeEditSplitViewController {
-            codeEditSplitVC.saveInspectorCollapsedState(isCollapsed: lastSplitView.isCollapsed)
-        }
-    }
-
     private func getSelectedCodeFile() -> CodeFileDocument? {
         workspace?.tabManager.activeTabGroup.selected?.fileDocument
     }
@@ -303,6 +284,38 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
     }
 }
 
+extension CodeEditWindowController {
+    @objc
+    func toggleFirstPanel() {
+        guard let firstSplitView = splitViewController.splitViewItems.first else { return }
+        firstSplitView.animator().isCollapsed.toggle()
+        if let codeEditSplitVC = splitViewController as? CodeEditSplitViewController {
+            codeEditSplitVC.saveNavigatorCollapsedState(isCollapsed: firstSplitView.isCollapsed)
+        }
+    }
+
+    @objc
+    func toggleLastPanel() {
+        guard let lastSplitView = splitViewController.splitViewItems.last else { return }
+
+        if lastSplitView.isCollapsed {
+            window?.toolbar?.insertItem(withItemIdentifier: .itemListTrackingSeparator, at: 4)
+        }
+        NSAnimationContext.runAnimationGroup { _ in
+            lastSplitView.animator().isCollapsed.toggle()
+        } completionHandler: { [weak self] in
+            if lastSplitView.isCollapsed {
+                self?.window?.animator().toolbar?.removeItem(at: 4)
+            }
+        }
+
+        if let codeEditSplitVC = splitViewController as? CodeEditSplitViewController {
+            codeEditSplitVC.saveInspectorCollapsedState(isCollapsed: lastSplitView.isCollapsed)
+            codeEditSplitVC.hideInspectorToolbarBackground()
+        }
+    }
+}
+
 extension NSToolbarItem.Identifier {
     static let toggleFirstSidebarItem: NSToolbarItem.Identifier = NSToolbarItem.Identifier("ToggleFirstSidebarItem")
     static let toggleLastSidebarItem: NSToolbarItem.Identifier = NSToolbarItem.Identifier("ToggleLastSidebarItem")

CodeEdit/Features/InspectorSidebar/InspectorSidebarToolbarTop.swift

@@ -27,7 +27,8 @@ struct InspectorSidebarToolbarTop: View {
     }
 
     var body: some View {
-        ScrollView {
+        VStack(alignment: .center, spacing: 0) {
+            Divider()
             HStack(spacing: 10) {
                 ForEach(icons) { icon in
                     makeInspectorIcon(systemImage: icon.imageName, title: icon.title, id: icon.id)
@@ -46,18 +47,11 @@ struct InspectorSidebarToolbarTop: View {
                         )
                 }
             }
-            .frame(height: 29, alignment: .center)
-            .frame(maxWidth: .infinity)
-            .overlay(alignment: .top) {
-                Divider()
-            }
-            .overlay(alignment: .bottom) {
-                Divider()
-            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
             .animation(.default, value: icons)
+            Divider()
         }
-        .frame(height: 32, alignment: .center)
-        .frame(maxWidth: .infinity)
+        .frame(height: TabBarView.height)
     }
 
     func makeInspectorIcon(systemImage: String, title: String, id: Int) -> some View {

CodeEdit/Features/InspectorSidebar/InspectorSidebarView.swift

@@ -52,12 +52,9 @@ struct InspectorSidebarView: View {
             maxHeight: .infinity,
             alignment: .top
         )
-        .safeAreaInset(edge: .top) {
+        .safeAreaInset(edge: .top, spacing: 0) {
             InspectorSidebarToolbarTop(selection: $selection)
-                .padding(.bottom, -8)
+                .background(.ultraThinMaterial)
         }
-        .background(
-            EffectView(.windowBackground, blendingMode: .withinWindow)
-        )
     }
 }