Finish Activity Viewer Pills

Author: thecoolwinter

CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift

@@ -64,7 +64,7 @@ struct SchemeDropDownView: View {
         HStack(spacing: 4) {
             label
             chevron
-                .padding(.leading, 1)
+                .offset(x: 2)
                 .opacity(isHoveringScheme || isSchemePopOverPresented ? 0.0 : 1.0)
         }
         .background {

CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift

@@ -21,25 +21,12 @@ struct TaskDropDownView: View {
 
     var body: some View {
         Group {
-            if let selectedTask = taskManager.selectedTask {
-                if let selectedActiveTask = taskManager.activeTasks[selectedTask.id] {
-                    ActiveTaskView(activeTask: selectedActiveTask)
-                        .fixedSize()
-                } else {
-                    TaskView(task: selectedTask, status: CETaskStatus.notRunning)
-                        .fixedSize()
-                }
+            if #available(macOS 26, *) {
+                tahoe
             } else {
-                Text("Create Tasks")
-                    .frame(minWidth: 0)
+                seqouia
             }
         }
-        .opacity(activeState == .inactive ? 0.4 : 1.0)
-        .font(.subheadline)
-        .padding(.trailing, 11.5)
-        .padding(.horizontal, 2.5)
-        .padding(.vertical, 2.5)
-        .background(backgroundColor)
         .onHover { hovering in
             self.isHoveringTasks = hovering
         }
@@ -60,7 +47,49 @@ struct TaskDropDownView: View {
         }
     }
 
-    private var backgroundColor: some View {
+    @available(macOS 26, *)
+    @ViewBuilder private var tahoe: some View {
+        HStack(spacing: 4) {
+            label
+            chevronIcon
+                .opacity(isHoveringTasks || isTaskPopOverPresented ? 1.0 : 0.0)
+        }
+        .padding(6)
+        .background {
+            Color(nsColor: colorScheme == .dark ? .white : .black)
+                .opacity(isHoveringTasks || isTaskPopOverPresented ? 0.05 : 0)
+                .clipShape(Capsule(style: .continuous))
+        }
+    }
+
+    @ViewBuilder private var seqouia: some View {
+        label
+            .opacity(activeState == .inactive ? 0.4 : 1.0)
+            .padding(.trailing, 11.5)
+            .padding(.horizontal, 2.5)
+            .padding(.vertical, 2.5)
+            .background(backgroundColor)
+    }
+
+    @ViewBuilder private var label: some View {
+        Group {
+            if let selectedTask = taskManager.selectedTask {
+                if let selectedActiveTask = taskManager.activeTasks[selectedTask.id] {
+                    ActiveTaskView(activeTask: selectedActiveTask)
+                        .fixedSize()
+                } else {
+                    TaskView(task: selectedTask, status: CETaskStatus.notRunning)
+                        .fixedSize()
+                }
+            } else {
+                Text("Create Tasks")
+                    .frame(minWidth: 0)
+            }
+        }
+        .font(.subheadline)
+    }
+
+    @ViewBuilder private var backgroundColor: some View {
         Color(nsColor: colorScheme == .dark ? .white : .black)
             .opacity(isHoveringTasks || isTaskPopOverPresented ? 0.05 : 0)
             .clipShape(RoundedRectangle(cornerSize: CGSize(width: 4, height: 4)))
@@ -74,14 +103,14 @@ struct TaskDropDownView: View {
             )
     }
 
-    private var chevronIcon: some View {
+    @ViewBuilder private var chevronIcon: some View {
         Image(systemName: "chevron.down")
             .font(.system(size: 8, weight: .bold, design: .default))
             .padding(.top, 0.5)
             .padding(.trailing, 2)
     }
 
-    private var taskPopoverContent: some View {
+    @ViewBuilder private var taskPopoverContent: some View {
         VStack(alignment: .leading, spacing: 0) {
             if !taskManager.availableTasks.isEmpty {
                 ForEach(taskManager.availableTasks, id: \.id) { task in