Adjust Padding, Draw Split Edges Only in safe Area

Author: thecoolwinter

CodeEdit/Features/Editor/Views/EditorAreaView.swift

@@ -30,6 +30,9 @@ struct EditorAreaView: View {
     @Environment(\.window.value)
     private var window: NSWindow?
 
+    @Environment(\.isEditorLayoutAtEdge)
+    private var isAtEdge
+
     init(editor: Editor, focus: FocusState<Editor?>.Binding) {
         self.editor = editor
         self._focus = focus
@@ -101,6 +104,10 @@ struct EditorAreaView: View {
                 }
 
                 VStack(spacing: 0) {
+                    if isAtEdge != .top, #available(macOS 26, *) {
+                        Spacer().frame(height: 4)
+                    }
+
                     if topSafeArea > 0 {
                         Rectangle()
                             .fill(.clear)
@@ -167,7 +174,6 @@ struct EditorAreaView: View {
                     // )
                     // ```
                     // When we can figure out how to disable the 'not focused' glass effect.
-
                     $0.background(EffectView(.headerView).ignoresSafeArea(.all))
                 } else: {
                     $0.background(EffectView(.headerView))

CodeEdit/Features/Editor/Views/EditorLayoutView.swift

@@ -15,7 +15,7 @@ struct EditorLayoutView: View {
     @Environment(\.window.value)
     private var window
 
-    @Environment(\.isAtEdge)
+    @Environment(\.isEditorLayoutAtEdge)
     private var isAtEdge
 
     var toolbarHeight: CGFloat {
@@ -63,7 +63,7 @@ struct EditorLayoutView: View {
         var splitView: some View {
             ForEach(Array(data.editorLayouts.enumerated()), id: \.offset) { index, item in
                 EditorLayoutView(layout: item, focus: $focus)
-                   .transformEnvironment(\.isAtEdge) { belowToolbar in
+                   .transformEnvironment(\.isEditorLayoutAtEdge) { belowToolbar in
                        calcIsAtEdge(current: &belowToolbar, index: index)
                    }
                    .environment(\.splitEditor) { [weak data] edge, newEditor in
@@ -87,12 +87,12 @@ struct EditorLayoutView: View {
     }
 }
 
-private struct BelowToolbarEnvironmentKey: EnvironmentKey {
+struct BelowToolbarEnvironmentKey: EnvironmentKey {
     static var defaultValue: VerticalEdge.Set = .all
 }
 
 extension EnvironmentValues {
-    fileprivate var isAtEdge: BelowToolbarEnvironmentKey.Value {
+    var isEditorLayoutAtEdge: BelowToolbarEnvironmentKey.Value {
         get { self[BelowToolbarEnvironmentKey.self] }
         set { self[BelowToolbarEnvironmentKey.self] = newValue }
     }

CodeEdit/Features/SplitView/Views/SplitViewControllerView.swift

@@ -96,6 +96,16 @@ final class SplitViewController: NSSplitViewController {
         override var dividerThickness: CGFloat {
             customDividerStyle.customThickness ?? super.dividerThickness
         }
+
+        override func drawDivider(in rect: NSRect) {
+            let safeRect = NSRect(
+                x: rect.origin.x,
+                y: max(rect.origin.y, safeAreaRect.origin.y),
+                width: isVertical ? dividerThickness : rect.width,
+                height: isVertical ? safeAreaRect.height : dividerThickness
+            )
+            super.drawDivider(in: safeRect)
+        }
     }
 
     var items: [SplitViewItem] = []