Skip to content

The ultimate harness for coding agents and beyond. All your agents. All your machines. One command center. Start with code, then follow your curiosity and build across disciplines: CAD, circuits, robots, games and music.

fix(tui): keep the current row visible with 256 colours (#514)

lingrdc62ed96032bc
diff --git a/tui/src/bar.rs b/tui/src/bar.rs
index b5d803be8..acfe06409 100644
--- a/tui/src/bar.rs
+++ b/tui/src/bar.rs
@@ -137,8 +137,12 @@ fn colours() -> Colours {
return Colours { bg: r, row: r, rule: r, text: r, soft: r, muted: r, accent: r, green: r };
}
let fit = theme::depth_fit;
+ // The current row lifted off the background — further where the terminal has 256 colours and
+ // a small lift lands on the background's own colour, so the current row still shows.
+ let bg = fit(pal.background);
+ let row = [12, 20, 30, 40].iter().map(|a| fit(mix(pal.background, pal.foreground, *a))).find(|r| *r != bg).unwrap_or(bg);
Colours {
- bg: fit(pal.background), row: fit(mix(pal.background, pal.foreground, 12)), rule: fit(pal.border),
+ bg, row, rule: fit(pal.border),
text: fit(pal.foreground), soft: fit(pal.inactive_foreground), muted: fit(pal.muted), accent: theme::paint(theme::accent()),
green: theme::paint(theme::ONLINE),
}
diff --git a/tui/src/settings.rs b/tui/src/settings.rs
index 839cf4b54..0de1cd522 100644
--- a/tui/src/settings.rs
+++ b/tui/src/settings.rs
@@ -111,7 +111,10 @@ pub fn chrome_for(pal: theme::PanePalette) -> Chrome {
.remove_modifier(Modifier::BOLD | Modifier::REVERSED | Modifier::DIM | Modifier::UNDERLINED);
// (The cursor's row: the text's own colour, bold, on a lifted surface — the accent is for the
// pointer and the query's mark, not for words.)
- let selected = base.add_modifier(Modifier::BOLD).bg(theme::depth_fit(mix(panel, fg, 10)));
+ // (Lifted further where the terminal has 256 colours and a small lift is the panel's colour.)
+ let panel_fit = theme::depth_fit(panel);
+ let lifted = [10, 18, 28, 40].iter().map(|a| theme::depth_fit(mix(panel, fg, *a))).find(|c| *c != panel_fit).unwrap_or(panel_fit);
+ let selected = base.add_modifier(Modifier::BOLD).bg(lifted);
Chrome { base, muted, accent, backdrop, selected }
}
@@ -826,7 +829,15 @@ mod tests {
let a = chrome_for(theme::pane_palette_of(dark.background, dark.foreground));
let b = chrome_for(theme::pane_palette_of(light.background, light.foreground));
assert_ne!(a.base.bg, b.base.bg);
- let lum = |s: Style| match s.bg { Some(Color::Rgb(r, g, b)) => 299 * r as u32 + 587 * g as u32 + 114 * b as u32, _ => 0 };
+ // (In truecolor an RGB; with 256 colours — a CI runner's terminal — an index into xterm's
+ // cube or its greys.)
+ let rgb = |c: Color| match c {
+ Color::Rgb(r, g, b) => (r, g, b),
+ Color::Indexed(i) if (16..232).contains(&i) => { let k = i - 16; let v = |n: u8| if n == 0 { 0 } else { 55 + 40 * n }; (v(k / 36), v(k / 6 % 6), v(k % 6)) }
+ Color::Indexed(i) if i >= 232 => { let g = 8 + 10 * (i - 232); (g, g, g) }
+ _ => (0, 0, 0),
+ };
+ let lum = |s: Style| { let (r, g, b) = rgb(s.bg.unwrap_or(Color::Reset)); 299 * r as u32 + 587 * g as u32 + 114 * b as u32 };
assert!(lum(b.base) > lum(a.base), "a light theme gives a light panel");
assert_ne!(a.base.bg, a.backdrop.bg, "the panel stands out from its backdrop");
assert_ne!(a.base.bg, a.selected.bg, "the cursor's row stands out");