summaryrefslogtreecommitdiff
path: root/tui/widget
diff options
context:
space:
mode:
authorJulian Hurst <julian.hurst@digdash.com>2025-03-20 14:47:03 +0100
committerJulian Hurst <julian.hurst@digdash.com>2025-03-20 14:47:03 +0100
commit2b33d4766affc5ead30eceba310a15780443ac83 (patch)
tree172a5b2465e5a34d41d82350c5e6080e99b07af8 /tui/widget
parent5e93fe240e489ff13a90a7ff29fee415c8113cc9 (diff)
parent5efb8c021fe2166648591e46591144a49bf575bf (diff)
downloadhare-tui-2b33d4766affc5ead30eceba310a15780443ac83.tar.gz
Merge branch 'master' into nomem
Diffstat (limited to 'tui/widget')
-rw-r--r--tui/widget/list/scrolllist.ha2
-rw-r--r--tui/widget/widget.ha4
2 files changed, 2 insertions, 4 deletions
diff --git a/tui/widget/list/scrolllist.ha b/tui/widget/list/scrolllist.ha
index fed58a5..2f18ef0 100644
--- a/tui/widget/list/scrolllist.ha
+++ b/tui/widget/list/scrolllist.ha
@@ -58,8 +58,6 @@ fn printscrolllist(widget: *widget::widget) void = {
const list = widget: *scrolllist;
assert(list.frame.start >= 0);
assert(list.frame.end <= len(list.items): int);
- fmt::errorln(list.frame.start)!;
- fmt::errorln(list.frame.end)!;
list.widget.buf = widget::linesbuf {
lines = list.items[list.frame.start..list.frame.end],
styles = &stylesscrolllist,
diff --git a/tui/widget/widget.ha b/tui/widget/widget.ha
index 3e6cf8d..39b77ba 100644
--- a/tui/widget/widget.ha
+++ b/tui/widget/widget.ha
@@ -234,11 +234,11 @@ fn truncate_to_size(w: *widget) []str = {
const line = w.buf.lines[i];
let item = match (w.sz) {
case let sz: tty::ttysize =>
- const s = if (tui::strwidth(line) > sz.columns) strings::sub(line, 0z, sz.columns) else line;
+ const s = if (tui::strwidth(line) > sz.columns) tui::subwidth(line, sz.columns) else line;
yield strings::rpad(s, ' ', sz.columns);
case void =>
const wsz = tty::winsize(w.state.out)!;
- const s = if (tui::strwidth(line) > wsz.columns) strings::sub(line, 0z, wsz.columns) else line;
+ const s = if (tui::strwidth(line) > wsz.columns) tui::subwidth(line, wsz.columns) else line;
yield strings::dup(s);
};
append(lines, item)!;