fix: cover compact provider switcher rows

steipete · steipete · commit c083b6d72ba6 · 2026-05-23T09:19:22.000+01:00
diff --git a/Sources/CodexBar/StatusItemController+SwitcherViews.swift b/Sources/CodexBar/StatusItemController+SwitcherViews.swift
@@ -102,7 +102,7 @@ final class ProviderSwitcherView: NSView {
             maxAllowedSegmentWidth: initialMaxAllowedSegmentWidth,
             stackedIcons: self.stackedIcons)
         self.rowSpacing = self.stackedIcons ? 4 : 2
-        self.rowHeight = Self.switcherRowHeight(stackedIcons: self.stackedIcons, rowCount: self.rowCount)
+        self.rowHeight = Self.switcherRowHeight(stackedIcons: self.stackedIcons)
         let height: CGFloat = self.rowHeight * CGFloat(self.rowCount)
             + self.rowSpacing * CGFloat(max(0, self.rowCount - 1))
         self.preferredWidth = width
@@ -547,20 +547,8 @@ final class ProviderSwitcherView: NSView {
         return rows
     }
 
-    private static func switcherRowHeight(stackedIcons: Bool, rowCount: Int) -> CGFloat {
-        // Compact mode: reduce height for multi-row switcher to save vertical space.
-        // rowCount >= 4: reduce by 4pt (40 → 36). rowCount == 3: reduce by 4pt (40 → 36).
-        // Single and two-row layouts stay unchanged to preserve comfortable touch targets.
-        // 36pt base safely fits stacked buttons with two-line titles and quota bars.
-        let baseRowHeight: CGFloat = if stackedIcons {
-            if rowCount >= 3 {
-                36
-            } else {
-                36
-            }
-        } else {
-            30
-        }
+    private static func switcherRowHeight(stackedIcons: Bool) -> CGFloat {
+        let baseRowHeight: CGFloat = stackedIcons ? 36 : 30
         return baseRowHeight + self.quotaIndicatorReservedHeight
     }
 
@@ -673,6 +661,14 @@ final class ProviderSwitcherView: NSView {
         self.buttons.map(\.fittingSize)
     }
 
+    func _test_rowCount() -> Int {
+        self.rowCount
+    }
+
+    func _test_rowHeight() -> CGFloat {
+        self.rowHeight
+    }
+
     func _test_setHoveredButtonTag(_ tag: Int?) {
         self.hoveredButtonTag = tag
         self.updateButtonStyles()
diff --git a/Tests/CodexBarTests/StatusMenuSwitcherClickTests.swift b/Tests/CodexBarTests/StatusMenuSwitcherClickTests.swift
@@ -461,13 +461,24 @@ struct StatusMenuSwitcherClickTests {
 
     @Test
     func `multi-row switcher uses compact height and stays inside bounds`() {
-        // 8 providers + Overview → 4-row layout with stacked icons, includes multi-word
-        // provider ("OpenCode Go") to exercise the two-line title path in compact mode.
-        // Compact mode should keep total height lower than old 4-row × 40pt baseline.
-        // Old baseline: 4 rows × 40pt + quotaReserved (8pt) ≈ 168pt
-        // Compact: 4 rows × 36pt + quotaReserved ≈ 152pt — clearly below baseline.
+        // 14 providers + Overview forces the four-row path and includes multi-word titles.
         let view = ProviderSwitcherView(
-            providers: [.codex, .claude, .cursor, .factory, .zai, .minimax, .alibaba, .opencodego],
+            providers: [
+                .codex,
+                .claude,
+                .cursor,
+                .factory,
+                .zai,
+                .minimax,
+                .alibaba,
+                .opencodego,
+                .grok,
+                .groq,
+                .gemini,
+                .openrouter,
+                .perplexity,
+                .kiro,
+            ],
             selected: .provider(.codex),
             includesOverview: true,
             width: 300,
@@ -484,8 +495,8 @@ struct StatusMenuSwitcherClickTests {
             #expect(frame.maxY <= view.bounds.maxY)
         }
 
-        // Compact height should be clearly below old 4-row baseline (~168pt).
-        // Threshold 160pt is conservative: 4 rows × 36pt + quotaReserved (8pt) ≈ 152pt.
-        #expect(view.bounds.height < 160)
+        #expect(view._test_rowCount() == 4)
+        #expect(view._test_rowHeight() == 44)
+        #expect(view.bounds.height == 188)
     }
 }
