Skip to content

[BUG][v0.0.7] model_picker.rs: fix legend overlap + UTF-8 caret misalignment #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sungdark wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −5
Open

[BUG][v0.0.7] model_picker.rs: fix legend overlap + UTF-8 caret misalignment #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions src/cortex-tui/src/widgets/model_picker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use ratatui::widgets::{
Block, Borders, Clear, Scrollbar, ScrollbarOrientation, ScrollbarState, Widget,
};
use unicode_segmentation::UnicodeSegmentation;
use unicode_width::UnicodeWidthStr;

// ============================================================
// MODEL ITEM
Expand Down Expand Up @@ -347,8 +348,9 @@ impl ModelPicker<'_> {

buf.set_string(x + 3, y, &display_query, query_style);

// Cursor
let cursor_x = x + 3 + self.state.search_query.len() as u16;
// Cursor — use display width (UnicodeWidthStr) not byte length,
// so CJK/emoji characters don't misalign the caret.
let cursor_x = x + 3 + UnicodeWidthStr::width(&self.state.search_query) as u16;
if cursor_x < search_inner.right() {
buf[(cursor_x, y)].set_bg(CYAN_PRIMARY);
}
Expand Down Expand Up @@ -480,14 +482,19 @@ impl ModelPicker<'_> {
let y = area.y;
let x = area.x + 1;

// Legend
// Legend — occupies columns x..x+21 ("* current " = 10, "+ popular" = 9)
buf.set_string(x, y, "* current ", Style::default().fg(GREEN));
buf.set_string(x + 11, y, "+ popular", Style::default().fg(ORANGE));

// Help
// Help — guard against overlap with legend when terminal is narrow.
// Legend ends at legend_right = x + 21. Require help_x > legend_right + 1 gap.
let legend_right = x + 21;
let help = "[Enter] select [Esc] cancel [Ctrl+L] clear search";
let help_x = area.right().saturating_sub(help.len() as u16 + 1);
buf.set_string(help_x, y, help, Style::default().fg(TEXT_MUTED));
if help_x > legend_right + 1 {
buf.set_string(help_x, y, help, Style::default().fg(TEXT_MUTED));
}
// When width is insufficient the legend renders alone — no garbled overlap.
}
}

Expand Down