Merge pull request #316 from charliek/feature/plan-023-badge

fix(iced): pin the notification dots to the Mac accent #007aff (#311)

Author: charliek

crates/roost-iced/src/chrome.rs

@@ -57,6 +57,15 @@ pub const ACTIVE_AGENT: Color = Color::from_rgb8(0x3a, 0x3a, 0x3a);
 pub const TEXT: Color = Color::from_rgb8(0xf2, 0xf2, 0xf2);
 pub const MUTED_TEXT: Color = Color::from_rgb8(0xa0, 0xa4, 0xb0);
 pub const NOTIFICATION: Color = Color::from_rgb8(0x4e, 0x9a, 0xf1);
+/// Both notification dots — the tab-pill badge and the sidebar
+/// project-row dot. Pinned to the Mac's `NSColor.controlAccentColor`
+/// (#007aff), which both Mac surfaces use (`App.swift:4772`, `:5207`)
+/// and which GTK hardcodes for its tab badge
+/// (`crates/roost-linux/src/resources/style.css:277-288`) rather than
+/// tracking the desktop accent — on COSMIC `@accent_bg_color` renders
+/// teal. Deliberately separate from `NOTIFICATION`: only the dots have a
+/// cited reference value (#311).
+pub const NOTIFICATION_BADGE: Color = Color::from_rgb8(0x00, 0x7a, 0xff);
 pub const DRAGGED_PILL: Color = Color::from_rgba8(0x55, 0x68, 0x7b, 0.65);
 pub const PALETTE_SURFACE: Color = Color::from_rgb8(0x2d, 0x2d, 0x33);
 pub const PALETTE_SELECTION: Color = Color::from_rgb8(0x48, 0x48, 0x4e);
@@ -114,7 +123,7 @@ pub fn tab_pill(active: bool, dragging: bool) -> impl Fn(&Theme) -> container::S
 
 pub fn badge(_: &Theme) -> container::Style {
     container::Style::default()
-        .background(NOTIFICATION)
+        .background(NOTIFICATION_BADGE)
         .border(Border::default().rounded(NOTIFICATION_DOT_SIZE / 2.0))
 }
 
@@ -455,4 +464,30 @@ mod tests {
         assert_eq!(style.border.color, ERROR_TEXT.scale_alpha(0.55));
         assert_eq!(style.border.width, 1.0);
     }
+
+    #[test]
+    fn notification_dots_pin_the_mac_accent_and_leave_the_generic_accent_alone() {
+        // Literals, not the constants themselves: comparing a constant to
+        // itself passes for any value and would not catch a re-flip.
+        assert_eq!(NOTIFICATION_BADGE, Color::from_rgb8(0x00, 0x7a, 0xff));
+        assert_eq!(NOTIFICATION, Color::from_rgb8(0x4e, 0x9a, 0xf1));
+
+        // Wiring, not color: this one is tautological on its own (it would
+        // hold for any value of the constant). It exists to catch `badge()`
+        // being repointed at a *different* constant; the literals above are
+        // what pin the value.
+        let theme = Theme::Dark;
+        assert_eq!(
+            badge(&theme).background,
+            Some(Background::Color(NOTIFICATION_BADGE)),
+            "both notification dots render the Mac accent"
+        );
+
+        // The generic accent keeps its other uses — nothing in #311's scope
+        // touches the rename affordances.
+        let focused =
+            inline_rename_input(&theme, text_input::Status::Focused { is_hovered: false });
+        assert_eq!(focused.border.color, NOTIFICATION);
+        assert_eq!(focused.selection, NOTIFICATION.scale_alpha(0.65));
+    }
 }

docs/development/iced-migration-roadmap.md

@@ -658,14 +658,19 @@ audited open set is:
   geometry, empty/loading/error states, remaining hover/focus states,
   offscreen-tab reveal, and confirm-overlay pointer modality; (b) **file/image drops**, upstream-blocked
   ([#302]); (c) **terminal IME** — closed by engine slice E6 (plan 021,
-  merged with this entry's edit); (d) one objective one-constant fix: iced's tab notification badge
-  is `#4e9af1` where GTK deliberately hardcodes the Mac's `#007aff` —
-  found by the audit, filed as [#311].
+  merged with this entry's edit); (d) fixed: the one-constant fix landed —
+  `chrome::badge()` now renders a dedicated `NOTIFICATION_BADGE` (`#007aff`)
+  instead of `#4e9af1`, pixel-verified by
+  `test_tab_strip_pixels.py::test_notification_dots_paint_the_accent` — and
+  it turned out to cover two dots, not one: the tab-pill badge and the
+  sidebar project-row dot both style off `badge()` and both were corrected —
+  found by the audit, filed and fixed as [#311].
 * The subjective P1s in (a) are Charlie-directed by design; M4's
-  "no open P0/P1" criterion therefore reduces to: land E6, fix the badge
-  constant, and either complete or explicitly waive the 3h items and the
-  #302-blocked remainder for the beta — his call, flagged in the plan-021
-  checklist. To be precise about waiver semantics: the criterion itself is
+  "no open P0/P1" criterion reduces to: E6 landed (c) and the badge
+  constant is fixed (d), so what remains is only to complete or explicitly
+  waive the 3h items and the #302-blocked remainder for the beta — his
+  call, flagged in the plan-021 checklist. To be precise about waiver
+  semantics: the criterion itself is
   unchanged and this audit waives nothing — [#284]'s recommendation covers
   only the cross-toolkit CI-gate question, and any per-row waiver is an
   owner decision that must be recorded on the row in the inventory before

docs/development/iced-parity-inventory.md

@@ -187,7 +187,7 @@ product polish, and P2 is an optional native/toolkit refinement.
 | Sidebar collapse/resize | Both references expose a toolbar toggle. Swift persists a 160–400 pt user width; GTK uses a 160 pt minimum/default 220 pt `GtkPaned` without persisting a 400 pt cap | Resolved (plan 016): no in-window collapse affordance, matching the Mac — reopen via keybind/palette only, the ☰ button is removed. Dragging the grip past half the 160 pt floor (below 80 px, unclamped) collapses the sidebar and drops the live drag width without committing, so reopening restores the pre-drag committed width rather than the 160 pt floor. Recorded parity divergence: NSSplitView lets a drag continue past the floor and re-expand within the same gesture; here the grip leaves the tree at collapse, so drag-back-to-reopen within one gesture is impossible | closed | Resize: functional e2e + real-input grip segment (shipped, plan 011). Collapse: unit matrix (threshold crossing, no-Dragged-after-Collapse, released-event no-op, reopen-width invariant) plus capture (shipped, plan 016) |
 | Tab strip | About 24 pt pills in a compact band with 6 pt gaps and horizontal overflow | Closed for active/manual reachability: 24 pt dark pills in a 32 pt band (trued up from 34 pt in plan 016) with independent horizontal overflow | closed | Band/pill geometry assertions under both renderers; overflow test |
 | Tab status | Shared lifecycle dot at leading edge, white active label, muted inactive label | Audit-confirmed 2026-08-07: shared lifecycle derivation holds and the semantic color logic is unit-tested (`app.rs:3502-3529`), but no pixel test captures dot/label geometry — `test_tab_strip_pixels.py` pins only the #281 scrollbar band and the divider hairline | P1 → 3h | Add focused status-slot geometry/color capture; retain the semantic color unit test |
-| Tab close/badge | **Corrected 2026-08-07**: the shipped Mac shows × only on the *active* pill with no hover reveal (`App.swift:4747` — `closeButton.isHidden = !isActive`); the original "or hovered" framing was wrong. Inactive notification uses a blue trailing badge — GTK deliberately hardcodes Mac's `#007aff` (`style.css:277-286`) | Active exact-ID close implemented and covered (real-input `_direct_tab_close`: exact removal, survivor PTY, last-tab cascade; badge suppression + clear in `test_notifications.py`). Hover-close is a *product* decision, not a parity port → 3h. **Open finding: iced's badge is `#4e9af1` (`chrome.rs:59`) vs the references' `#007aff`** — undocumented divergence, filed as [#311](https://github.com/charliek/roost/issues/311) | P1 | Badge color one-constant fix + a badge color/position pixel assertion remain; close/cascade/clear coverage is done (audit runs 2026-08-07) |
+| Tab close/badge | **Corrected 2026-08-07**: the shipped Mac shows × only on the *active* pill with no hover reveal (`App.swift:4747` — `closeButton.isHidden = !isActive`); the original "or hovered" framing was wrong. Inactive notification uses a blue trailing badge — GTK deliberately hardcodes Mac's `#007aff` (`style.css:277-286`) | Active exact-ID close implemented and covered (real-input `_direct_tab_close`: exact removal, survivor PTY, last-tab cascade; badge suppression + clear in `test_notifications.py`). Hover-close is a *product* decision, not a parity port → 3h. **Closed: [#311](https://github.com/charliek/roost/issues/311) is fixed** — `chrome::badge()` now renders a dedicated `NOTIFICATION_BADGE` (`#007aff`) instead of `NOTIFICATION` (`#4e9af1`). The finding turned out to cover two surfaces, not one: `badge()` styles both the tab-pill badge and the sidebar project-row dot, and both have a Mac reference at `NSColor.controlAccentColor` (`App.swift:4772`, `:5207`), so both were corrected | P1 → 3h | Badge fix covered by `test_tab_strip_pixels.py::test_notification_dots_paint_the_accent` (color, size, and position for both the tab badge and the sidebar dot, mutation-verified); close/cascade/clear coverage is done (audit runs 2026-08-07) |
 | Tab rename | Inline rename through double-click or the configured command, with authoritative persistence | Closed: compact inline editor uses stable IDs, select-all focus, Enter commit, Escape/click-away cancel, and shared GTK/Iced trim/no-op policy | closed | X11 physical shortcut/double-click/Enter/Escape/click-away gate, zero PTY leakage, relaunch persistence, and named GTK/Iced captures |
 | Tab reorder | Pointer drag reorder with visible insertion feedback | Closed: stable-ID drag preview, insertion feedback, exact authoritative commit, cancellation, overflow, and relaunch persistence work under both renderers | closed | Bidirectional physical X11/Wayland input, outside-release/palette cancellation, zero PTY leakage, and named product captures |
 | New-tab affordance | Compact plus control following the pills | Closed (re-shaped by plan 016): the plus sits inside the scrolling strip 6px after the last pill and scrolls with overflow — Mac parity, where ＋ is an arranged strip subview. Under overflow it scrolls offscreen (accepted; keybind/palette still create tabs) | closed | Real-input click computed from the last pill's rendered right edge opens one PTY-backed tab (plan 016 harness rework) |

tools/roosttest/test_sidebar_pixels.py

@@ -119,27 +119,45 @@ def _components(points: set[tuple[int, int]]) -> list[tuple[int, int, int, int]]
     return sorted(out)
 
 
-def _dot_blobs(shot, max_x: int) -> dict[str, list[tuple[int, int, int, int]]]:
-    """Solid, dot-sized blobs of each lifecycle colour within `max_x`."""
+def _blobs(
+    shot,
+    color: tuple[int, int, int],
+    *,
+    x0: int = 0,
+    x1: int | None = None,
+    y0: int = 0,
+    y1: int | None = None,
+    tol: int = 0,
+    min_side: int = 1,
+) -> list[tuple[int, int, int, int]]:
+    """Connected components matching `color` within [x0,x1) x [y0,y1),
+    filtered to those at least `min_side` on both axes. Returns
+    (minx, miny, maxx, maxy) tuples, sorted."""
     width, height, bpp, px = shot
-    max_x = max(0, min(max_x, width))
-    matches: dict[str, set[tuple[int, int]]] = {name: set() for name in LIFECYCLE_COLORS}
-    for y in range(height):
+    x1 = width if x1 is None else min(x1, width)
+    y1 = height if y1 is None else min(y1, height)
+    x0 = max(0, min(x0, x1))
+    y0 = max(0, min(y0, y1))
+    tr, tg, tb = color
+    points: set[tuple[int, int]] = set()
+    for y in range(y0, y1):
         base = y * width * bpp
-        for x in range(max_x):
+        for x in range(x0, x1):
             o = base + x * bpp
-            r, g, b = px[o], px[o + 1], px[o + 2]
-            for name, (tr, tg, tb) in LIFECYCLE_COLORS.items():
-                if abs(r - tr) <= COLOR_TOL and abs(g - tg) <= COLOR_TOL and abs(b - tb) <= COLOR_TOL:
-                    matches[name].add((x, y))
-                    break
+            if abs(px[o] - tr) <= tol and abs(px[o + 1] - tg) <= tol and abs(px[o + 2] - tb) <= tol:
+                points.add((x, y))
+    return [
+        c
+        for c in _components(points)
+        if (c[2] - c[0] + 1) >= min_side and (c[3] - c[1] + 1) >= min_side
+    ]
+
+
+def _dot_blobs(shot, max_x: int) -> dict[str, list[tuple[int, int, int, int]]]:
+    """Solid, dot-sized blobs of each lifecycle colour within `max_x`."""
     return {
-        name: [
-            c
-            for c in _components(pts)
-            if (c[2] - c[0] + 1) >= MIN_DOT_SIDE and (c[3] - c[1] + 1) >= MIN_DOT_SIDE
-        ]
-        for name, pts in matches.items()
+        name: _blobs(shot, color, x1=max_x, tol=COLOR_TOL, min_side=MIN_DOT_SIDE)
+        for name, color in LIFECYCLE_COLORS.items()
     }
 
 
@@ -163,15 +181,7 @@ def _longest_vertical_run(shot, x: int, color: tuple[int, int, int]) -> int:
 
 
 def _color_components(shot, max_x: int, color: tuple[int, int, int]):
-    width, height, bpp, px = shot
-    points = set()
-    for y in range(height):
-        base = y * width * bpp
-        for x in range(min(width, max_x)):
-            offset = base + x * bpp
-            if tuple(px[offset : offset + 3]) == color:
-                points.add((x, y))
-    return _components(points)
+    return _blobs(shot, color, x1=max_x)
 
 
 def _capture(roost, path: Path):