Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 4 additions & 28 deletions crates/warp_tui/src/tui_column_layout.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//! Shared width allocation and text formatting for two-column TUI rows.

use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};

const ELLIPSIS: &str = "...";
use warpui_core::elements::tui::{text_width, truncate_with_ellipsis};

/// Width policy for a group of two-column rows.
#[derive(Clone, Copy)]
Expand Down Expand Up @@ -52,12 +50,12 @@ pub(crate) fn tui_two_column_layout<'a>(
longest_first_columns = Some(
longest_first_columns
.unwrap_or_default()
.max(UnicodeWidthStr::width(first)),
.max(usize::from(text_width(first))),
);
longest_second_columns = Some(
longest_second_columns
.unwrap_or_default()
.max(UnicodeWidthStr::width(second)),
.max(usize::from(text_width(second))),
);
}

Expand Down Expand Up @@ -117,34 +115,12 @@ pub(crate) fn format_tui_first_column(text: &str, layout: TuiTwoColumnLayout) ->
let content_columns = first_columns.saturating_sub(gap_columns);
let mut formatted = truncate_with_ellipsis(text, content_columns);
if layout.show_second {
let formatted_columns = UnicodeWidthStr::width(formatted.as_str());
let formatted_columns = usize::from(text_width(&formatted));
formatted.push_str(&" ".repeat(first_columns - formatted_columns));
}
formatted
}

/// Truncates `text` to `maximum_columns`, using as much of `...` as fits.
fn truncate_with_ellipsis(text: &str, maximum_columns: usize) -> String {
if UnicodeWidthStr::width(text) <= maximum_columns {
return text.to_owned();
}

let ellipsis_columns = UnicodeWidthStr::width(ELLIPSIS).min(maximum_columns);
let prefix_columns = maximum_columns - ellipsis_columns;
let mut prefix = String::new();
let mut prefix_width = 0;
for character in text.chars() {
let character_width = UnicodeWidthChar::width(character).unwrap_or_default();
if prefix_width + character_width > prefix_columns {
break;
}
prefix.push(character);
prefix_width += character_width;
}
prefix.push_str(&".".repeat(ellipsis_columns));
prefix
}

#[cfg(test)]
#[path = "tui_column_layout_tests.rs"]
mod tests;
2 changes: 2 additions & 0 deletions crates/warpui_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ titlecase = "1.0"
tokio.workspace = true
tracing.workspace = true
trait-set = "0.3.0"
unicode-segmentation.workspace = true
unicode-width.workspace = true
vec1.workspace = true
warp_util.workspace = true

Expand Down
7 changes: 7 additions & 0 deletions crates/warpui_core/src/elements/tui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ mod scene;
mod scrollable;
mod selectable;
mod shimmering_text;
mod tab_bar;
mod text;
mod text_helpers;
mod viewported_list;

pub use animated::TuiAnimated;
Expand Down Expand Up @@ -75,7 +77,12 @@ pub use selectable::{
TuiSelectionHandle, TuiSelectionSpan,
};
pub use shimmering_text::TuiShimmeringText;
pub use tab_bar::{
TuiTab, TuiTabBar, TuiTabBarConfig, TuiTabBarEvent, TuiTabBarNavigationDirection,
TuiTabBarStyles,
};
pub use text::TuiText;
pub use text_helpers::{text_width, truncate_with_ellipsis};
pub use viewported_list::{
TuiViewportContent, TuiViewportPosition, TuiViewportVerticalAlignment, TuiViewportWindow,
TuiViewportedElement, TuiViewportedList, TuiViewportedListState, TuiVisibleViewportItem,
Expand Down
Loading