Finish Utility Area

Author: thecoolwinter

CodeEdit/Features/StatusBar/Views/StatusBarView.swift

@@ -22,7 +22,21 @@ struct StatusBarView: View {
     @Environment(\.controlActiveState)
     private var controlActive
 
-    static let height = 28.0
+    static var height: CGFloat {
+        if #available(macOS 26, *) {
+            37.0
+        } else {
+            29.0
+        }
+    }
+
+    private var trailingPadding: CGFloat {
+        if #available(macOS 26, *) {
+            8
+        } else {
+            0
+        }
+    }
 
     @Environment(\.colorScheme)
     private var colorScheme
@@ -43,8 +57,9 @@ struct StatusBarView: View {
             StatusBarToggleUtilityAreaButton()
         }
         .padding(.horizontal, 10)
+        .padding(.trailing, trailingPadding)
         .cursor(.resizeUpDown)
-        .frame(height: Self.height)
+        .frame(height: Self.height - 1.0)
         .background(.bar)
         .padding(.top, 1)
         .overlay(alignment: .top) {

CodeEdit/Features/UtilityArea/Views/PaneToolbar.swift

@@ -13,39 +13,79 @@ struct PaneToolbar<Content: View>: View {
     @Environment(\.paneArea)
     var paneArea: PaneArea?
 
+    private var height: CGFloat? {
+        if #available(macOS 26, *) {
+            36.0
+        } else {
+            nil
+        }
+    }
+
+    private var maxHeight: CGFloat? {
+        if #available(macOS 26, *) {
+            nil
+        } else {
+            27.0
+        }
+    }
+
+    private var padding: CGSize {
+        if #available(macOS 26, *) {
+            CGSize(width: 5.0, height: 0)
+        } else {
+            CGSize(width: 5.0, height: 8.0)
+        }
+    }
+
     var body: some View {
-        HStack(spacing: 5) {
-            if model.hasLeadingSidebar
-                && (
-                    ((paneArea == .main || paneArea == .mainLeading)
-                        && model.leadingSidebarIsCollapsed)
-                    || paneArea == .leading
-                ) {
+        HStack(alignment: .center, spacing: 5) {
+            if shouldShowLeadingSection() {
                 PaneToolbarSection {
                     Spacer()
                         .frame(width: 24)
                 }
                 .opacity(0)
             }
             content
-            if model.hasTrailingSidebar
-                && (
-                    ((paneArea == .main || paneArea == .mainTrailing)
-                        && model.trailingSidebarIsCollapsed)
-                    || paneArea == .trailing
-                ) || !model.hasTrailingSidebar {
-                if model.hasTrailingSidebar {
-                    PaneToolbarSection {
-                        Spacer()
-                            .frame(width: 24)
-                    }
-                    .opacity(0)
+            if shouldShowTrailingSection() {
+                PaneToolbarSection {
+                    Spacer()
+                        .frame(width: 24)
                 }
+                .opacity(0)
+            }
+            if #available(macOS 26, *), isTrailingItem() {
+                Spacer().frame(width: 5)
             }
         }
         .buttonStyle(.icon(size: 24))
-        .padding(.horizontal, 5)
-        .padding(.vertical, 8)
-        .frame(maxHeight: 27)
+        .padding(.horizontal, padding.width)
+        .padding(.vertical, padding.height)
+        .frame(maxHeight: maxHeight)
+        .frame(height: height)
+    }
+
+    private func shouldShowLeadingSection() -> Bool {
+        model.hasLeadingSidebar
+        && (
+            ((paneArea == .main || paneArea == .mainLeading) && model.leadingSidebarIsCollapsed)
+            || paneArea == .leading
+        )
+    }
+
+    private func shouldShowTrailingSection() -> Bool {
+        model.hasTrailingSidebar
+        && (
+            ((paneArea == .main || paneArea == .mainTrailing) && model.trailingSidebarIsCollapsed)
+            || paneArea == .trailing
+        )
+    }
+
+    private func isTrailingItem() -> Bool {
+        paneArea == .trailing
+         || (
+            (paneArea == .main || paneArea == .mainTrailing)
+            && (model.trailingSidebarIsCollapsed || !model.hasTrailingSidebar)
+         )
     }
 }

CodeEdit/Features/UtilityArea/Views/UtilityAreaTabView.swift

@@ -118,14 +118,22 @@ struct UtilityAreaTabView<Content: View, LeadingSidebar: View, TrailingSidebar:
                         }
                         .buttonStyle(.icon(isActive: !model.leadingSidebarIsCollapsed))
                     }
-                    Divider()
+                    if #available(macOS 26, *) {
+                        Divider().frame(height: 12)
+                    } else {
+                        Divider()
+                    }
                 }
             }
         }
         .overlay(alignment: .bottomTrailing) {
             if model.hasTrailingSidebar {
                 PaneToolbar {
-                    Divider()
+                    if #available(macOS 26, *) {
+                        Divider().frame(height: 12)
+                    } else {
+                        Divider()
+                    }
                     PaneToolbarSection {
                         Button {
                             model.trailingSidebarIsCollapsed.toggle()

CodeEdit/WorkspaceView.swift

@@ -35,8 +35,6 @@ struct WorkspaceView: View {
     @State private var editorsHeight: CGFloat = 0
     @State private var drawerHeight: CGFloat = 0
 
-    private let statusbarHeight: CGFloat = 29
-
     private var keybindings: KeybindingManager =  .shared
 
     var body: some View {
@@ -162,15 +160,15 @@ struct WorkspaceView: View {
             UtilityAreaView()
                 .frame(height: utilityAreaViewModel.isMaximized ? nil : drawerHeight)
                 .frame(maxHeight: utilityAreaViewModel.isMaximized ? .infinity : nil)
-                .padding(.top, utilityAreaViewModel.isMaximized ? statusbarHeight + 1 : 0)
+                .padding(.top, utilityAreaViewModel.isMaximized ? StatusBarView.height + 1 : 0)
                 .offset(y: utilityAreaViewModel.isMaximized ? 0 : editorsHeight + 1)
             VStack(spacing: 0) {
                 StatusBarView(proxy: proxy)
                 if utilityAreaViewModel.isMaximized {
                     PanelDivider()
                 }
             }
-            .offset(y: utilityAreaViewModel.isMaximized ? 0 : editorsHeight - statusbarHeight)
+            .offset(y: utilityAreaViewModel.isMaximized ? 0 : editorsHeight - StatusBarView.height)
         }
         .accessibilityElement(children: .contain)
     }