Finish Up Toolbar Look

Author: thecoolwinter

CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabBackground.swift

@@ -29,8 +29,11 @@ struct EditorTabBackground: View {
         ZStack {
             if isActive {
                 // Content background (visible if active)
-                EffectView(.contentBackground)
-                    .opacity(isActive ? 1 : 0)
+                if #available(macOS 26, *) {
+                    GlassEffectView()
+                } else {
+                    EffectView(.contentBackground)
+                }
 
                 // Accent color (visible if active)
                 Color(.controlAccentColor)

CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabCloseButton.swift

@@ -42,7 +42,11 @@ struct EditorTabCloseButton: View {
         .frame(width: buttonSize, height: buttonSize)
         .background(backgroundColor)
         .foregroundColor(isPressingClose ? .primary : .secondary)
-        .clipShape(RoundedRectangle(cornerRadius: 2))
+        .if(.tahoe) {
+            $0.clipShape(Circle())
+        } else: {
+            $0.clipShape(RoundedRectangle(cornerRadius: 2))
+        }
         .contentShape(Rectangle())
         .gesture(
             DragGesture(minimumDistance: 0)

CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabView.swift

@@ -120,10 +120,11 @@ struct EditorTabView: View {
 
     @ViewBuilder var content: some View {
         HStack(spacing: 0.0) {
-            EditorTabDivider()
-                .opacity(
-                    (isActive || inHoldingState) ? 0.0 : 1.0
-                )
+
+            if #unavailable(macOS 26) {
+                EditorTabDivider()
+                    .opacity((isActive || inHoldingState) ? 0.0 : 1.0)
+            }
             // Tab content (icon and text).
             HStack(alignment: .center, spacing: 3) {
                 Image(nsImage: tabFile.nsIcon)
@@ -163,14 +164,19 @@ struct EditorTabView: View {
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
             }
+            .if(.tahoe) {
+                $0.padding(.horizontal, 1.5)
+            }
             .opacity(
                 // Inactive states for tab bar item content.
                 activeState != .inactive
                 ? 1.0
                 : isActive ? 0.6 : 0.4
             )
-            EditorTabDivider()
-                .opacity((isActive || inHoldingState) ? 0.0 : 1.0)
+            if #unavailable(macOS 26) {
+                EditorTabDivider()
+                    .opacity((isActive || inHoldingState) ? 0.0 : 1.0)
+            }
         }
         .foregroundColor(
             isActive && isActiveEditor
@@ -202,6 +208,11 @@ struct EditorTabView: View {
                 EditorTabBackground(isActive: isActive, isPressing: isPressing, isDragging: isDragging)
                     .animation(.easeInOut(duration: 0.08), value: isHovering)
             }
+            .if(.tahoe) {
+                if #available(macOS 26, *) {
+                    $0.clipShape(Capsule()).clipped().containerShape(Capsule())
+                }
+            }
             // TODO: Enable the following code snippet when dragging-out behavior should be allowed.
             // Since we didn't handle the drop-outside event, dragging-out is disabled for now.
             //            .onDrag({

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

@@ -260,6 +260,12 @@ struct EditorTabs: View {
                     ) {
                         ForEach(Array(openedTabs.enumerated()), id: \.element) { index, id in
                             if let item = editor.tabs.first(where: { $0.file.id == id }) {
+                                if index != 0
+                                    && editor.selectedTab?.file.id != id
+                                    && editor.selectedTab?.file.id != openedTabs[index - 1] {
+                                    EditorTabDivider()
+                                }
+
                                 EditorTabView(
                                     file: item.file,
                                     index: index,
@@ -293,6 +299,12 @@ struct EditorTabs: View {
                                         tabWidth: $tabWidth
                                     )
                                 )
+
+                                if index < openedTabs.count - 1
+                                    && editor.selectedTab?.file.id != id
+                                    && editor.selectedTab?.file.id != openedTabs[index + 1] {
+                                    EditorTabDivider()
+                                }
                             }
                         }
                     }
@@ -341,26 +353,33 @@ 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)
+                    // Unfortunate triple if here due to needing to compile on
+                    // earlier Xcodes.
+#if compiler(>=6.2)
+                    $0.background(GlassEffectView(tintColor: .tertiarySystemFill))
+                        .clipShape(Capsule())
+                        .clipped()
+#else
+                    $0
+#endif
                 }
             }
         }

CodeEdit/Features/Editor/Views/EditorAreaView.swift

@@ -111,7 +111,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(
@@ -125,6 +127,12 @@ struct EditorAreaView: View {
                         }
                         .environmentObject(editor)
                         .padding(.top, shouldShowTabBar ? -1 : 0)
+                        if #unavailable(macOS 26) {
+                            Divider()
+                        }
+                    }
+                    // On Tahoe we only show one divider
+                    if #available(macOS 26, *), shouldShowTabBar || showEditorJumpBar {
                         Divider()
                     }
                 }