Adjust Branch Picker and Scheme Dropdown

Author: thecoolwinter

CodeEdit/Features/ActivityViewer/ActivityViewer.swift

@@ -32,6 +32,34 @@ struct ActivityViewer: View {
         self.taskManager = taskManager
     }
     var body: some View {
+        Group {
+            if #available(macOS 26, *) {
+                content
+                    .fixedSize(horizontal: false, vertical: false)
+                    .padding(.horizontal, 4)
+            } else {
+                content
+                    .fixedSize(horizontal: false, vertical: false)
+                    .padding(.horizontal, 5)
+                    .padding(.vertical, 1.5)
+                    .frame(height: 22)
+                    .clipped()
+                    .background {
+                        if colorScheme == .dark {
+                            RoundedRectangle(cornerRadius: 5)
+                                .opacity(0.1)
+                        } else {
+                            RoundedRectangle(cornerRadius: 5)
+                                .opacity(0.1)
+                        }
+                    }
+            }
+        }
+        .accessibilityElement(children: .contain)
+        .accessibilityLabel("Activity Viewer")
+    }
+
+    @ViewBuilder private var content: some View {
         HStack(spacing: 0) {
             SchemeDropDownView(
                 workspaceSettingsManager: workspaceSettingsManager,
@@ -45,21 +73,5 @@ struct ActivityViewer: View {
             TaskNotificationView(taskNotificationHandler: taskNotificationHandler)
                 .fixedSize()
         }
-        .fixedSize(horizontal: false, vertical: false)
-        .padding(.horizontal, 5)
-        .padding(.vertical, 1.5)
-        .frame(height: 22)
-        .clipped()
-        .background {
-            if colorScheme == .dark {
-                RoundedRectangle(cornerRadius: 5)
-                    .opacity(0.1)
-            } else {
-                RoundedRectangle(cornerRadius: 5)
-                    .opacity(0.1)
-            }
-        }
-        .accessibilityElement(children: .contain)
-        .accessibilityLabel("Activity Viewer")
     }
 }

CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift

@@ -32,30 +32,11 @@ struct SchemeDropDownView: View {
     }
 
     var body: some View {
-        HStack(spacing: 6) {
-            Image(systemName: "folder.badge.gearshape")
-                .imageScale(.medium)
-            Text(workspaceDisplayName)
-                .frame(minWidth: 0)
-        }
-        .opacity(activeState == .inactive ? 0.4 : 1.0)
-        .font(.subheadline)
-        .padding(.trailing, 11.5)
-        .padding(.horizontal, 2.5)
-        .padding(.vertical, 2.5)
-        .background {
-            Color(nsColor: colorScheme == .dark ? .white : .black)
-                .opacity(isHoveringScheme || isSchemePopOverPresented ? 0.05 : 0)
-                .clipShape(RoundedRectangle(cornerSize: CGSize(width: 4, height: 4)))
-            HStack {
-                Spacer()
-                if isHoveringScheme || isSchemePopOverPresented {
-                    chevronDown
-                        .padding(.trailing, 2)
-                } else {
-                    chevron
-                        .padding(.trailing, 4)
-                }
+        Group {
+            if #available(macOS 26, *) {
+                tahoe
+            } else {
+                seqouia
             }
         }
         .onHover(perform: { hovering in
@@ -78,15 +59,73 @@ struct SchemeDropDownView: View {
         }
     }
 
-    private var chevron: some View {
+    @available(macOS 26, *)
+    @ViewBuilder private var tahoe: some View {
+        HStack(spacing: 4) {
+            label
+            chevron
+                .padding(.leading, 1)
+                .opacity(isHoveringScheme || isSchemePopOverPresented ? 0.0 : 1.0)
+        }
+        .background {
+            if isHoveringScheme || isSchemePopOverPresented {
+                HStack {
+                    Spacer()
+                    chevronDown
+                }
+            }
+        }
+        .padding(6)
+        .padding(.leading, 2) // apparently this is cummulative?
+        .background {
+            Color(nsColor: colorScheme == .dark ? .white : .black)
+                .opacity(isHoveringScheme || isSchemePopOverPresented ? 0.05 : 0)
+                .clipShape(Capsule(style: .continuous))
+        }
+    }
+
+    @ViewBuilder private var seqouia: some View {
+        label
+            .padding(.trailing, 11.5)
+            .padding(.horizontal, 2.5)
+            .padding(.vertical, 2.5)
+            .background {
+                Color(nsColor: colorScheme == .dark ? .white : .black)
+                    .opacity(isHoveringScheme || isSchemePopOverPresented ? 0.05 : 0)
+                    .clipShape(RoundedRectangle(cornerSize: CGSize(width: 4, height: 4)))
+                HStack {
+                    Spacer()
+                    if isHoveringScheme || isSchemePopOverPresented {
+                        chevronDown
+                            .padding(.trailing, 2)
+                    } else {
+                        chevron
+                            .padding(.trailing, 4)
+                    }
+                }
+            }
+    }
+
+    @ViewBuilder private var label: some View {
+        HStack(spacing: 6) {
+            Image(systemName: "folder.badge.gearshape")
+                .imageScale(.medium)
+            Text(workspaceDisplayName)
+                .frame(minWidth: 0)
+        }
+        .opacity(activeState == .inactive ? 0.4 : 1.0)
+        .font(.subheadline)
+    }
+
+    @ViewBuilder private var chevron: some View {
         Image(systemName: "chevron.compact.right")
             .font(.system(size: 9, weight: .medium, design: .default))
             .foregroundStyle(.secondary)
             .scaleEffect(x: 1.30, y: 1.0, anchor: .center)
             .imageScale(.large)
     }
 
-    private var chevronDown: some View {
+    @ViewBuilder private var chevronDown: some View {
         VStack(spacing: 1) {
             Image(systemName: "chevron.down")
         }

CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift

@@ -89,6 +89,9 @@ struct ToolbarBranchPicker: View {
                 await self.sourceControlManager?.refreshBranches()
             }
         }
+        .if(.tahoe) {
+            $0.padding(.leading, 10).frame(minWidth: 140)
+        }
     }
 
     private var inactiveColor: Color {

CodeEdit/Utils/Extensions/View/View+if.swift

@@ -0,0 +1,34 @@
+//
+//  View+if.swift
+//  CodeEdit
+//
+//  Created by Khan Winter on 8/28/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, transform: (Self) -> Content) -> some View {
+        if condition {
+            transform(self)
+        } else {
+            self
+        }
+    }
+}
+
+extension Bool {
+     static var tahoe: Bool {
+         if #available(macOS 26, *) {
+             return true
+         } else {
+             return false
+         }
+     }
+ }