Begin Work

Author: thecoolwinter

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,37 @@
+//
+//  GlassEffectView.swift
+//  CodeEdit
+//
+//  Created by Khan Winter on 9/2/25.
+//
+
+import SwiftUI
+import AppKit
+
+struct GlassEffectView: NSViewRepresentable {
+    var tintColor: NSColor?
+
+    init(tintColor: NSColor? = nil) {
+        self.tintColor = tintColor
+    }
+
+    func makeNSView(context: Context) -> NSView {
+#if compiler(>=6.2)
+        if #available(macOS 26, *) {
+            let view = NSGlassEffectView()
+            view.cornerRadius = 0
+            view.tintColor = tintColor
+            return view
+        }
+#endif
+        return NSView()
+    }
+
+    func updateNSView(_ nsView: NSView, context: Context) {
+#if compiler(>=6.2)
+        if #available(macOS 26, *), let view = nsView as? NSGlassEffectView {
+            view.tintColor = tintColor
+        }
+#endif
+    }
+}

CodeEdit/Features/CodeEditUI/Views/GlassEffectView.swift

@@ -341,21 +341,27 @@ struct EditorTabs: View {
                 // To fill up the parent space of tab bar.
                 .frame(maxWidth: .infinity)
             }
-            .overlay(alignment: .leading) {
-                EditorTabsOverflowShadow(
-                    width: colorScheme == .dark ? 5 : 7,
-                    startPoint: .leading,
-                    endPoint: .trailing
-                )
-                .opacity(scrollOffset >= 0 ? 0 : 1)
-            }
-            .overlay(alignment: .trailing) {
-                EditorTabsOverflowShadow(
-                    width: colorScheme == .dark ? 5 : 7,
-                    startPoint: .trailing,
-                    endPoint: .leading
-                )
-                .opacity((scrollTrailingOffset ?? 0) <= 0 ? 0 : 1)
+            .if(.tahoe) {
+                if #available(macOS 26.0, *) {
+                    $0.background(GlassEffectView(tintColor: .secondarySystemFill)).clipShape(Capsule())
+                }
+            } else: {
+                $0.overlay(alignment: .leading) {
+                    EditorTabsOverflowShadow(
+                        width: colorScheme == .dark ? 5 : 7,
+                        startPoint: .leading,
+                        endPoint: .trailing
+                    )
+                    .opacity(scrollOffset >= 0 ? 0 : 1)
+                }
+                .overlay(alignment: .trailing) {
+                    EditorTabsOverflowShadow(
+                        width: colorScheme == .dark ? 5 : 7,
+                        startPoint: .trailing,
+                        endPoint: .leading
+                    )
+                    .opacity((scrollTrailingOffset ?? 0) <= 0 ? 0 : 1)
+                }
             }
         }
     }

CodeEdit/Features/Editor/TabBar/Tabs/Views/EditorTabs.swift

@@ -19,6 +19,18 @@ struct EditorAreaView: View {
     @AppSettings(\.general.dimEditorsWithoutFocus)
     var dimEditorsWithoutFocus
 
+    @AppSettings(\.theme.useThemeBackground)
+    var useThemeBackground
+
+    private var backgroundColor: NSColor {
+        let fallback = NSColor.textBackgroundColor
+        return if useThemeBackground {
+            ThemeModel.shared.selectedTheme?.editor.background.nsColor ?? fallback
+        } else {
+            fallback
+        }
+    }
+
     @ObservedObject var editor: Editor
 
     @FocusState.Binding var focus: Editor?
@@ -111,7 +123,9 @@ struct EditorAreaView: View {
                         EditorTabBarView(hasTopInsets: topSafeArea > 0, codeFile: fileBinding)
                             .id("TabBarView" + editor.id.uuidString)
                             .environmentObject(editor)
-                        Divider()
+                        if #unavailable(macOS 26) {
+                            Divider()
+                        }
                     }
                     if showEditorJumpBar {
                         EditorJumpBarView(
@@ -129,7 +143,8 @@ struct EditorAreaView: View {
                     }
                 }
                 .environment(\.isActiveEditor, editor == editorManager.activeEditor)
-                .background(EffectView(.headerView))
+//                .background(EffectView(.headerView))
+                .background(GlassEffectView())
             }
         }
         .focused($focus, equals: editor)

CodeEdit/Features/Editor/Views/EditorAreaView.swift

@@ -0,0 +1,52 @@
+//
+//  View+if.swift
+//  CodeEdit
+//
+//  Created by Khan Winter on 9/5/25.
+//
+
+import SwiftUI
+
+extension View {
+    /// Applies the given transform if the given condition evaluates to `true`.
+    /// - Parameters:
+    ///   - condition: The condition to evaluate.
+    ///   - transform: The transform to apply to the source `View`.
+    /// - Returns: Either the original `View` or the modified `View` if the condition is `true`.
+    @ViewBuilder
+    func `if`<Content: View>(_ condition: Bool, @ViewBuilder transform: (Self) -> Content) -> some View {
+        if condition {
+            transform(self)
+        } else {
+            self
+        }
+    }
+
+    /// Applies the given transform if the given condition evaluates to `true`.
+    /// - Parameters:
+    ///   - condition: The condition to evaluate.
+    ///   - transform: The transform to apply to the source `View`.
+    /// - Returns: Either the original `View` or the modified `View` if the condition is `true`.
+    @ViewBuilder
+    func `if`<Content: View, ElseContent: View>(
+        _ condition: Bool,
+        @ViewBuilder transform: (Self) -> Content,
+        @ViewBuilder else elseTransform: (Self) -> ElseContent
+    ) -> some View {
+        if condition {
+            transform(self)
+        } else {
+            elseTransform(self)
+        }
+    }
+}
+
+extension Bool {
+    static var tahoe: Bool {
+        if #available(macOS 26, *) {
+            return true
+        } else {
+            return false
+        }
+    }
+}