Restore sidebar workspace icon size

Sources/ContentView.swift

@@ -10884,14 +10884,14 @@ struct VerticalTabsSidebar: View {
         isSelected: Bool,
         dropRows: [ExtensionSidebarBrowserStackDropRow]
     ) -> some View {
-        let targetRowHeight: CGFloat = 54
+        let targetRowHeight = ExtensionBrowserStackSidebarMetrics.tileHeight
 
         return Button {
             selectExtensionSidebarWorkspace(row.workspaceId)
         } label: {
-            extensionBrowserStackIcon(row.leadingIcon, size: 28)
+            extensionBrowserStackIcon(row.leadingIcon, size: ExtensionBrowserStackSidebarMetrics.iconSize)
                 .frame(maxWidth: .infinity)
-                .frame(height: 54)
+                .frame(height: targetRowHeight)
                 .background(
                     RoundedRectangle(cornerRadius: 13, style: .continuous)
                         .fill(
@@ -10957,13 +10957,16 @@ struct VerticalTabsSidebar: View {
         isSelected: Bool,
         dropRows: [ExtensionSidebarBrowserStackDropRow]
     ) -> some View {
-        let targetRowHeight: CGFloat = compact ? 34 : 38
+        let targetRowHeight = ExtensionBrowserStackSidebarMetrics.rowHeight(compact: compact)
+        let rowHorizontalPadding = ExtensionBrowserStackSidebarMetrics.rowHorizontalPadding(compact: compact)
+        let rowVerticalPadding = ExtensionBrowserStackSidebarMetrics.rowVerticalPadding(compact: compact)
+        let rowCornerRadius = ExtensionBrowserStackSidebarMetrics.rowCornerRadius(compact: compact)
 
         return Button {
             selectExtensionSidebarWorkspace(row.workspaceId)
         } label: {
             HStack(spacing: 9) {
-                extensionBrowserStackIcon(row.leadingIcon, size: compact ? 22 : 24)
+                extensionBrowserStackIcon(row.leadingIcon, size: ExtensionBrowserStackSidebarMetrics.iconSize)
                 Text(row.title)
                     .font(.system(size: compact ? 12.5 : 13, weight: .medium))
                     .foregroundColor(isSelected ? .primary : .primary.opacity(0.82))
@@ -10977,14 +10980,14 @@ struct VerticalTabsSidebar: View {
                         .lineLimit(1)
                 }
             }
-            .padding(.horizontal, compact ? 7 : 10)
-            .padding(.vertical, compact ? 6 : 7)
+            .padding(.horizontal, rowHorizontalPadding)
+            .padding(.vertical, rowVerticalPadding)
             .background(
-                RoundedRectangle(cornerRadius: compact ? 8 : 10, style: .continuous)
+                RoundedRectangle(cornerRadius: rowCornerRadius, style: .continuous)
                     .fill(isSelected ? Color.primary.opacity(0.12) : Color.clear)
             )
             .overlay(
-                RoundedRectangle(cornerRadius: compact ? 8 : 10, style: .continuous)
+                RoundedRectangle(cornerRadius: rowCornerRadius, style: .continuous)
                     .stroke(isSelected ? cmuxAccentColor().opacity(0.55) : Color.clear, lineWidth: 1)
             )
             .contentShape(Rectangle())
@@ -11128,6 +11131,32 @@ struct VerticalTabsSidebar: View {
         return snapshotsById
     }
 
+    private enum ExtensionBrowserStackSidebarMetrics {
+        static let iconSize: CGFloat = 28
+        static let tileHeight: CGFloat = 54
+
+        private static let regularRowHeight: CGFloat = 38
+        private static let compactRowHeight: CGFloat = 34
+
+        static func rowHeight(compact: Bool) -> CGFloat {
+            compact ? compactRowHeight : regularRowHeight
+        }
+
+        static func rowHorizontalPadding(compact: Bool) -> CGFloat {
+            compact ? 7 : 10
+        }
+
+        static func rowVerticalPadding(compact: Bool) -> CGFloat {
+            let height = rowHeight(compact: compact)
+            precondition(iconSize <= height, "iconSize (\(iconSize)) must not exceed rowHeight (\(height))")
+            return (height - iconSize) / 2
+        }
+
+        static func rowCornerRadius(compact: Bool) -> CGFloat {
+            compact ? 8 : 10
+        }
+    }
+
     private func extensionBrowserStackIcon(
         _ icon: CmuxExtensionSidebarRenderIcon?,
         size: CGFloat

Sources/RightSidebarChromeStyle.swift

@@ -5,9 +5,8 @@ enum HeaderChromeIconStyle {
     static let hoveredOpacity = 0.96
     static let pressedOpacity = 1.0
     static let disabledOpacity = 0.34
-    static let weight: Font.Weight = .regular
+    static let weight: Font.Weight = .semibold
     static let foregroundColor = Color(nsColor: .secondaryLabelColor)
-    static let sidebarGlyphStrokeWidth: CGFloat = 1
 
     static func iconFrameSize(forIconSize iconSize: CGFloat) -> CGFloat {
         HeaderChromeControlMetrics.iconFrameSize(forIconSize: iconSize)

Sources/Update/MinimalModeSidebarControls.swift

@@ -4,6 +4,7 @@ import SwiftUI
 
 struct MinimalModeSidebarControlActionProxyView: NSViewRepresentable {
     let config: TitlebarControlsStyleConfig
+    var buttonCount = TitlebarControlsHitRegions.sidebarChromeButtonCount
     var isEnabled = true
     var requiresRevealedState = false
     let onAction: (MinimalModeSidebarControlActionSlot, NSView, NSPoint) -> Void
@@ -20,6 +21,7 @@ struct MinimalModeSidebarControlActionProxyView: NSViewRepresentable {
 
     private func configure(_ view: MinimalModeSidebarControlActionView) {
         view.config = config
+        view.buttonCount = buttonCount
         view.isEnabled = isEnabled
         view.requiresRevealedState = requiresRevealedState
         view.onAction = onAction
@@ -28,14 +30,19 @@ struct MinimalModeSidebarControlActionProxyView: NSViewRepresentable {
 
 enum TitlebarControlsHitRegions {
     static let outerLeadingPadding: CGFloat = 4
-    static let buttonCount = MinimalModeSidebarControlActionSlot.allCases.count
+    static let sidebarChromeButtonCount = TitlebarShortcutHintActionSlot.sidebarChromeSlots.count
+    static let allTitlebarButtonCount = MinimalModeSidebarControlActionSlot.allCases.count
 
-    static func buttonXRanges(config: TitlebarControlsStyleConfig) -> [ClosedRange<CGFloat>] {
+    static func buttonXRanges(
+        config: TitlebarControlsStyleConfig,
+        buttonCount: Int = sidebarChromeButtonCount
+    ) -> [ClosedRange<CGFloat>] {
         var ranges: [ClosedRange<CGFloat>] = []
-        ranges.reserveCapacity(buttonCount)
+        let clampedButtonCount = max(0, min(buttonCount, allTitlebarButtonCount))
+        ranges.reserveCapacity(clampedButtonCount)
 
         var minX = outerLeadingPadding + config.groupPadding.leading
-        for _ in 0..<buttonCount {
+        for _ in 0..<clampedButtonCount {
             let maxX = minX + config.buttonSize
             ranges.append(minX...maxX)
             minX = maxX + config.spacing
@@ -46,16 +53,22 @@ enum TitlebarControlsHitRegions {
 
     static func sidebarActionSlot(
         at point: NSPoint,
-        config: TitlebarControlsStyleConfig
+        config: TitlebarControlsStyleConfig,
+        buttonCount: Int = sidebarChromeButtonCount
     ) -> MinimalModeSidebarControlActionSlot? {
-        for (index, range) in buttonXRanges(config: config).enumerated() where range.contains(point.x) {
+        for (index, range) in buttonXRanges(config: config, buttonCount: buttonCount).enumerated()
+            where range.contains(point.x) {
             return MinimalModeSidebarControlActionSlot(rawValue: index)
         }
         return nil
     }
 
-    static func pointFallsInButtonColumn(_ point: NSPoint, config: TitlebarControlsStyleConfig) -> Bool {
-        sidebarActionSlot(at: point, config: config) != nil
+    static func pointFallsInButtonColumn(
+        _ point: NSPoint,
+        config: TitlebarControlsStyleConfig,
+        buttonCount: Int = sidebarChromeButtonCount
+    ) -> Bool {
+        sidebarActionSlot(at: point, config: config, buttonCount: buttonCount) != nil
     }
 }
 
@@ -64,6 +77,10 @@ final class MinimalModeSidebarControlActionView: NSView {
     {
         didSet { needsLayout = true }
     }
+    var buttonCount = TitlebarControlsHitRegions.sidebarChromeButtonCount
+    {
+        didSet { needsLayout = true }
+    }
     var isEnabled = true
     {
         didSet { syncButtons() }
@@ -139,7 +156,7 @@ final class MinimalModeSidebarControlActionView: NSView {
 
     override func accessibilityChildren() -> [Any]? {
         guard isRevealed || !requiresRevealedState else { return [] }
-        return MinimalModeSidebarControlActionSlot.allCases.compactMap { buttons[$0] }
+        return visibleSlots.compactMap { buttons[$0] }
     }
 
     override func acceptsFirstMouse(for event: NSEvent?) -> Bool {
@@ -153,7 +170,11 @@ final class MinimalModeSidebarControlActionView: NSView {
             return nil
         }
         guard bounds.contains(point) else { return nil }
-        guard let slot = TitlebarControlsHitRegions.sidebarActionSlot(at: point, config: config) else {
+        guard let slot = TitlebarControlsHitRegions.sidebarActionSlot(
+            at: point,
+            config: config,
+            buttonCount: buttonCount
+        ) else {
             return nil
         }
         if NSApp.currentEvent?.type == .rightMouseDown, !slot.acceptsContextMenu {
@@ -175,7 +196,11 @@ final class MinimalModeSidebarControlActionView: NSView {
 
     override func mouseDown(with event: NSEvent) {
         let localPoint = convert(event.locationInWindow, from: nil)
-        guard let slot = TitlebarControlsHitRegions.sidebarActionSlot(at: localPoint, config: config) else {
+        guard let slot = TitlebarControlsHitRegions.sidebarActionSlot(
+            at: localPoint,
+            config: config,
+            buttonCount: buttonCount
+        ) else {
             super.mouseDown(with: event)
             return
         }
@@ -188,7 +213,11 @@ final class MinimalModeSidebarControlActionView: NSView {
 
     override func rightMouseDown(with event: NSEvent) {
         let localPoint = convert(event.locationInWindow, from: nil)
-        guard let slot = TitlebarControlsHitRegions.sidebarActionSlot(at: localPoint, config: config),
+        guard let slot = TitlebarControlsHitRegions.sidebarActionSlot(
+            at: localPoint,
+            config: config,
+            buttonCount: buttonCount
+        ),
               shouldAcceptAction(at: localPoint) else {
             super.rightMouseDown(with: event)
             return
@@ -207,7 +236,10 @@ final class MinimalModeSidebarControlActionView: NSView {
 
     override func layout() {
         super.layout()
-        let ranges = TitlebarControlsHitRegions.buttonXRanges(config: config)
+        for button in buttons.values {
+            button.frame = .zero
+        }
+        let ranges = TitlebarControlsHitRegions.buttonXRanges(config: config, buttonCount: buttonCount)
         for (index, range) in ranges.enumerated() {
             guard let slot = MinimalModeSidebarControlActionSlot(rawValue: index),
                   let button = buttons[slot] else { continue }
@@ -221,6 +253,12 @@ final class MinimalModeSidebarControlActionView: NSView {
         syncButtons()
     }
 
+    private var visibleSlots: ArraySlice<MinimalModeSidebarControlActionSlot> {
+        MinimalModeSidebarControlActionSlot.allCases.prefix(
+            max(0, min(buttonCount, TitlebarControlsHitRegions.allTitlebarButtonCount))
+        )
+    }
+
     @objc private func buttonPressed(_ sender: NSButton) {
         guard let sender = sender as? MinimalModeSidebarControlButton else { return }
         performButtonAction(sender)