Skip to content

Commit ebc12c9

Browse files
committed
Ensure info widgets have bottom-border text
1 parent d06dc76 commit ebc12c9

3 files changed

Lines changed: 175 additions & 32 deletions

File tree

‎crates/jcode-tui/src/tui/info_widget.rs‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,28 @@ pub enum WidgetKind {
120120
}
121121

122122
impl WidgetKind {
123+
/// A quiet description for widgets without a more specific footer (such
124+
/// as an overflow count, account hint, legend, or page indicator).
125+
fn footer_description(self) -> &'static str {
126+
match self {
127+
Self::Overview => "Session overview",
128+
Self::WorkspaceMap => "Workspace layout",
129+
Self::MemoryActivity => "Memory activity",
130+
Self::SwarmStatus => "Agent sessions",
131+
Self::BackgroundTasks => "Background work",
132+
Self::Compaction => "Context summary",
133+
Self::UsageLimits => "Provider limits",
134+
Self::KvCache => "Prompt caching",
135+
Self::ModelInfo => "Runtime details",
136+
Self::Diagrams => "Latest diagram",
137+
Self::AmbientMode => "Scheduled activity",
138+
Self::Tips => "Tips & shortcuts",
139+
Self::GitStatus => "Working tree",
140+
Self::CloudVm => "Remote machine",
141+
Self::Commits => "Recent history",
142+
}
143+
}
144+
123145
/// Priority for display (lower = higher priority)
124146
pub fn priority(self) -> u8 {
125147
match self {
@@ -1380,6 +1402,7 @@ fn render_single_widget(frame: &mut Frame, placement: &WidgetPlacement, data: &I
13801402
if data.diagrams.len() > 1 {
13811403
chrome = chrome.title_right(frame::dim(format!("1/{}", data.diagrams.len())));
13821404
}
1405+
let chrome = chrome.footer_if_empty(frame::dim(placement.kind.footer_description()));
13831406
frame.render_widget(chrome.apply(block, rect.width), rect);
13841407
render_diagrams_widget(frame, inner, data);
13851408
return;
@@ -1397,7 +1420,9 @@ fn render_single_widget(frame: &mut Frame, placement: &WidgetPlacement, data: &I
13971420
if data.workspace_rows.is_empty() || inner.width == 0 || inner.height == 0 {
13981421
return;
13991422
}
1400-
let chrome = Framed::default().title(frame::label("Workspace"));
1423+
let chrome = Framed::default()
1424+
.title(frame::label("Workspace"))
1425+
.footer_if_empty(frame::dim(placement.kind.footer_description()));
14011426
frame.render_widget(chrome.apply(block, rect.width), rect);
14021427
super::workspace_map_widget::render_workspace_map(
14031428
frame.buffer_mut(),
@@ -1520,7 +1545,7 @@ fn render_overview_framed(data: &InfoWidgetData, inner: Rect) -> Option<Framed>
15201545
}
15211546
framed = framed.footer_right(Line::from(dots));
15221547
}
1523-
Some(framed)
1548+
Some(framed.footer_if_empty(frame::dim(WidgetKind::Overview.footer_description())))
15241549
}
15251550
#[cfg(test)]
15261551
#[derive(Debug, Clone)]
@@ -1710,7 +1735,9 @@ fn render_widget_content(kind: WidgetKind, data: &InfoWidgetData, inner: Rect) -
17101735
WidgetKind::CloudVm => super::info_widget_cloud::render_cloud_widget(data, inner),
17111736
WidgetKind::Commits => render_commits_widget(data, inner),
17121737
};
1713-
framed.settle()
1738+
framed
1739+
.settle()
1740+
.footer_if_empty(frame::dim(kind.footer_description()))
17141741
}
17151742

17161743
fn render_compaction_widget(data: &InfoWidgetData, inner: Rect) -> Framed {

‎crates/jcode-tui/src/tui/info_widget_frame.rs‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,23 @@ impl Framed {
7474
self
7575
}
7676

77+
/// Keep existing footer details, but never leave a visible frame's bottom
78+
/// border empty when neither slot contains text.
79+
pub(crate) fn footer_if_empty(mut self, line: impl Into<Line<'static>>) -> Self {
80+
if ![&self.footer, &self.footer_right]
81+
.into_iter()
82+
.flatten()
83+
.any(|line| {
84+
line.spans
85+
.iter()
86+
.any(|span| !span.content.trim().is_empty())
87+
})
88+
{
89+
self.footer = Some(line.into());
90+
}
91+
self
92+
}
93+
7794
/// A widget whose body is empty would render as a bare border with text
7895
/// on it, which placement treats as border-only. Pull the headline back
7996
/// into the body so there is always at least one content row.
@@ -258,6 +275,38 @@ mod tests {
258275
assert!(rows[2].ends_with(" ● edited ╯"), "{}", rows[2]);
259276
}
260277

278+
#[test]
279+
fn missing_or_blank_footers_receive_fallback_text() {
280+
for framed in [
281+
Framed::body(vec![Line::from("x")]),
282+
Framed::body(vec![Line::from("x")])
283+
.footer(" ")
284+
.footer_right(""),
285+
] {
286+
let framed = framed.footer_if_empty(dim("Working tree"));
287+
for width in [8, 12, 30] {
288+
let rows = render(&framed, width);
289+
assert!(rows[2].contains("Wor"), "{}", rows[2]);
290+
assert_eq!(UnicodeWidthStr::width(rows[2].as_str()), usize::from(width));
291+
}
292+
}
293+
}
294+
295+
#[test]
296+
fn fallback_preserves_existing_footer_slots() {
297+
for framed in [
298+
Framed::body(vec![Line::from("x")]).footer("+3 more"),
299+
Framed::body(vec![Line::from("x")]).footer_right("● edited"),
300+
Framed::body(vec![Line::from("x")])
301+
.footer("+3 more")
302+
.footer_right("● edited"),
303+
] {
304+
let before = render(&framed, 30);
305+
let after = render(&framed.footer_if_empty(dim("fallback")), 30);
306+
assert_eq!(before, after);
307+
}
308+
}
309+
261310
#[test]
262311
fn lone_right_footer_truncates_with_ellipsis() {
263312
let f = Framed::body(vec![Line::from("x")]).footer_right("abcdefghijklmnopqrstuvwxyz");

‎crates/jcode-tui/src/tui/info_widget_tests.rs‎

Lines changed: 96 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,9 +1607,8 @@ fn compact_page_height_matches_for_cost_based_usage() {
16071607

16081608
/// Visual gallery: draws every text widget through the real
16091609
/// `render_single_widget` path. Run with
1610-
/// `cargo test -p jcode-tui --lib widget_gallery -- --ignored --nocapture`.
1610+
/// `justrust test -p jcode-tui --lib widget_gallery -- --nocapture`.
16111611
#[test]
1612-
#[ignore]
16131612
fn widget_gallery() {
16141613
use super::{
16151614
AmbientWidgetData, CompactionInfo, DirtyFile, GitInfo, Side, WidgetPlacement,
@@ -1874,35 +1873,103 @@ fn widget_gallery() {
18741873
WidgetKind::Commits,
18751874
WidgetKind::Overview,
18761875
];
1877-
let width = 44u16;
1878-
for kind in kinds {
1879-
let cap = if kind == WidgetKind::Overview { 40 } else { 12 };
1880-
let mut h = calculate_widget_height(kind, &data, width, cap);
1881-
if h <= 2 {
1882-
// Ambient/Tips are gated off in layout; draw them anyway.
1883-
h = 8;
1876+
for width in [12u16, 24, 44] {
1877+
for kind in kinds {
1878+
let cap = if kind == WidgetKind::Overview { 40 } else { 12 };
1879+
let mut h = calculate_widget_height(kind, &data, width, cap);
1880+
if h <= 2 {
1881+
// Ambient/Tips are gated off in layout; draw them anyway.
1882+
h = 8;
1883+
}
1884+
let backend = ratatui::backend::TestBackend::new(width, h);
1885+
let mut terminal = ratatui::Terminal::new(backend).unwrap();
1886+
terminal
1887+
.draw(|f| {
1888+
let placement = WidgetPlacement {
1889+
kind,
1890+
rect: f.area(),
1891+
side: Side::Left,
1892+
};
1893+
render_single_widget(f, &placement, &data);
1894+
})
1895+
.unwrap();
1896+
let buf = terminal.backend().buffer().clone();
1897+
let bottom = (0..h)
1898+
.find(|&y| buf[(0, y)].symbol() == "╰")
1899+
.unwrap_or_else(|| panic!("{kind:?} at width {width} has no bottom border"));
1900+
let footer: String = (1..width - 1).map(|x| buf[(x, bottom)].symbol()).collect();
1901+
assert!(
1902+
footer.chars().any(|ch| ch != '─' && !ch.is_whitespace()),
1903+
"{kind:?} at width {width} has an empty footer: {footer}"
1904+
);
1905+
println!("{kind:?}");
1906+
for y in 0..h {
1907+
let row: String = (0..width)
1908+
.map(|x| buf[(x, y)].symbol().to_string())
1909+
.collect();
1910+
println!("{}", row.trim_end());
1911+
}
1912+
println!();
18841913
}
1885-
let backend = ratatui::backend::TestBackend::new(width, h);
1886-
let mut terminal = ratatui::Terminal::new(backend).unwrap();
1887-
terminal
1888-
.draw(|f| {
1889-
let placement = WidgetPlacement {
1890-
kind,
1891-
rect: f.area(),
1892-
side: Side::Left,
1893-
};
1894-
render_single_widget(f, &placement, &data);
1895-
})
1896-
.unwrap();
1897-
let buf = terminal.backend().buffer().clone();
1898-
println!("{kind:?}");
1899-
for y in 0..h {
1900-
let row: String = (0..width)
1901-
.map(|x| buf[(x, y)].symbol().to_string())
1902-
.collect();
1903-
println!("{}", row.trim_end());
1914+
}
1915+
}
1916+
1917+
#[test]
1918+
fn special_widgets_have_bottom_border_text() {
1919+
use super::{CloudProbeState, CloudStatusInfo, Side, WidgetPlacement};
1920+
use ratatui::{Terminal, backend::TestBackend};
1921+
let data = InfoWidgetData {
1922+
workspace_rows: vec![crate::tui::workspace_map::VisibleWorkspaceRow {
1923+
workspace: 0,
1924+
is_current: true,
1925+
focused_index: Some(0),
1926+
sessions: vec![crate::tui::workspace_map::WorkspaceSessionTile::new("fox")],
1927+
}],
1928+
cloud_info: Some(CloudStatusInfo {
1929+
host: "test-host".into(),
1930+
remote_dir: "/workspace".into(),
1931+
local_dir: None,
1932+
local_is_source: false,
1933+
started_at: std::time::SystemTime::now(),
1934+
last_success: None,
1935+
probe_duration_ms: None,
1936+
state: CloudProbeState::Loading,
1937+
machine: None,
1938+
last_transfer_at: None,
1939+
}),
1940+
..Default::default()
1941+
};
1942+
// The diagram branch must retain its footer even while image data is absent.
1943+
for kind in [
1944+
WidgetKind::Diagrams,
1945+
WidgetKind::WorkspaceMap,
1946+
WidgetKind::CloudVm,
1947+
] {
1948+
for width in [12u16, 24, 44] {
1949+
let mut terminal = Terminal::new(TestBackend::new(width, 12)).unwrap();
1950+
terminal
1951+
.draw(|f| {
1952+
super::render_all(
1953+
f,
1954+
&[WidgetPlacement {
1955+
kind,
1956+
rect: f.area(),
1957+
side: Side::Right,
1958+
}],
1959+
&data,
1960+
);
1961+
})
1962+
.unwrap();
1963+
let buf = terminal.backend().buffer();
1964+
let bottom = (0..12)
1965+
.find(|&y| buf[(0, y)].symbol() == "╰")
1966+
.expect("rendered widget must have a bottom border");
1967+
let footer: String = (1..width - 1).map(|x| buf[(x, bottom)].symbol()).collect();
1968+
assert!(
1969+
footer.chars().any(char::is_alphabetic),
1970+
"{kind:?}: {footer}"
1971+
);
19041972
}
1905-
println!();
19061973
}
19071974
}
19081975

0 commit comments

Comments
 (0)