valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update UI treatment of slash command menu to match that of the TS CLI (#1161)

Browse Source 
Uses the same colors as in the TypeScript CLI:


![image](https://github.com/user-attachments/assets/919cd472-ffb4-4654-a46a-d84f0cd9c097)

Now it is also readable on a light theme, e.g., in Ghostty:


![image](https://github.com/user-attachments/assets/468c37b0-ea63-4455-9b48-73dc2c95f0f6)
This commit is contained in:
Michael Bolin
2025-05-29 14:57:55 -07:00
committed by GitHub
parent a768a6a41d
commit a32d305ae6
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
codex-rs/tui/src/bottom_pane/command_popup.rs
View File

@@ -4,6 +4,7 @@ use ratatui::buffer::Buffer;
use ratatui::layout::Rect; use ratatui::layout::Rect;
use ratatui::style::Color; use ratatui::style::Color;
use ratatui::style::Style; use ratatui::style::Style;
use ratatui::style::Stylize;
use ratatui::widgets::Block; use ratatui::widgets::Block;
use ratatui::widgets::BorderType; use ratatui::widgets::BorderType;
use ratatui::widgets::Borders; use ratatui::widgets::Borders;
@@ -147,8 +148,6 @@ impl CommandPopup {
impl WidgetRef for CommandPopup { impl WidgetRef for CommandPopup {
fn render_ref(&self, area: Rect, buf: &mut Buffer) { fn render_ref(&self, area: Rect, buf: &mut Buffer) {
let style = Style::default().bg(Color::Blue).fg(Color::White);
let matches = self.filtered_commands(); let matches = self.filtered_commands();
let mut rows: Vec<Row> = Vec::new(); let mut rows: Vec<Row> = Vec::new();
@@ -157,21 +156,25 @@ impl WidgetRef for CommandPopup {
if visible_matches.is_empty() { if visible_matches.is_empty() {
rows.push(Row::new(vec![ rows.push(Row::new(vec![
Cell::from("").style(style), Cell::from(""),
Cell::from("No matching commands").style(style.add_modifier(Modifier::ITALIC)), Cell::from("No matching commands").add_modifier(Modifier::ITALIC),
])); ]));
} else { } else {
let default_style = Style::default();
let command_style = Style::default().fg(Color::LightBlue);
for (idx, cmd) in visible_matches.iter().enumerate() { for (idx, cmd) in visible_matches.iter().enumerate() {
let highlight = Style::default().bg(Color::White).fg(Color::Blue); let (cmd_style, desc_style) = if Some(idx) == self.selected_idx {
let cmd_style = if Some(idx) == self.selected_idx { (
highlight command_style.bg(Color::DarkGray),
default_style.bg(Color::DarkGray),
)
} else { } else {
style (command_style, default_style)
}; };
rows.push(Row::new(vec![ rows.push(Row::new(vec![
Cell::from(cmd.command().to_string()).style(cmd_style), Cell::from(format!("/{}", cmd.command())).style(cmd_style),
Cell::from(cmd.description().to_string()).style(style), Cell::from(cmd.description().to_string()).style(desc_style),
])); ]));
} }
} }
@@ -182,13 +185,11 @@ impl WidgetRef for CommandPopup {
rows, rows,
[Constraint::Length(FIRST_COLUMN_WIDTH), Constraint::Min(10)], [Constraint::Length(FIRST_COLUMN_WIDTH), Constraint::Min(10)],
) )
.style(style) .column_spacing(0)
.column_spacing(1)
.block( .block(
Block::default() Block::default()
.borders(Borders::ALL) .borders(Borders::ALL)
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded),
.style(style),
); );
table.render(area, buf); table.render(area, buf);