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

Align user history message prefix width (#3467)

Browse Source 
<img width="798" height="340" alt="image"
src="https://github.com/user-attachments/assets/fdd63f40-9c94-4e3a-bce5-2d2f333a384f"
/>
This commit is contained in:
Ahmed Ibrahim
2025-09-14 16:51:08 -04:00
committed by GitHub
parent d701eb32d7
commit 7e1543f5d8
18 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
codex-rs/tui/src/bottom_pane/chat_composer.rs
View File

@@ -38,6 +38,7 @@ use crate::bottom_pane::textarea::TextAreaState;
use crate::clipboard_paste::normalize_pasted_path;
use crate::clipboard_paste::pasted_image_format;
use crate::key_hint;
use crate::ui_consts::LIVE_PREFIX_COLS;
use codex_file_search::FileMatch;
use std::cell::RefCell;
use std::collections::HashMap;
@@ -136,7 +137,9 @@ impl ChatComposer {
}
pub fn desired_height(&self, width: u16) -> u16 {
self.textarea.desired_height(width - 1)
// Leave 1 column for the left border and 1 column for left padding
self.textarea
.desired_height(width.saturating_sub(LIVE_PREFIX_COLS))
+ match &self.active_popup {
ActivePopup::None => FOOTER_HEIGHT_WITH_HINT,
ActivePopup::Command(c) => c.calculate_required_height(),
@@ -153,8 +156,9 @@ impl ChatComposer {
let [textarea_rect, _] =
Layout::vertical([Constraint::Min(1), popup_constraint]).areas(area);
let mut textarea_rect = textarea_rect;
textarea_rect.width = textarea_rect.width.saturating_sub(1);
textarea_rect.x += 1;
// Leave 1 for border and 1 for padding
textarea_rect.width = textarea_rect.width.saturating_sub(LIVE_PREFIX_COLS);
textarea_rect.x = textarea_rect.x.saturating_add(LIVE_PREFIX_COLS);
let state = self.textarea_state.borrow();
self.textarea.cursor_pos_with_state(textarea_rect, &state)
}
@@ -1274,7 +1278,6 @@ impl WidgetRef for ChatComposer {
key_hint::ctrl('J')
};
vec![
" ".into(),
key_hint::plain('⏎'),
" send ".into(),
newline_hint_key,
@@ -1342,15 +1345,16 @@ impl WidgetRef for ChatComposer {
buf,
);
let mut textarea_rect = textarea_rect;
textarea_rect.width = textarea_rect.width.saturating_sub(1);
textarea_rect.x += 1;
// Leave 1 for border and 1 for padding
textarea_rect.width = textarea_rect.width.saturating_sub(LIVE_PREFIX_COLS);
textarea_rect.x = textarea_rect.x.saturating_add(LIVE_PREFIX_COLS);
let mut state = self.textarea_state.borrow_mut();
StatefulWidgetRef::render_ref(&(&self.textarea), textarea_rect, buf, &mut state);
if self.textarea.text().is_empty() {
Line::from(self.placeholder_text.as_str())
.style(Style::default().dim())
.render_ref(textarea_rect.inner(Margin::new(1, 0)), buf);
.render_ref(textarea_rect.inner(Margin::new(0, 0)), buf);
}
}
}

4
codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__backspace_after_pastes.snap
View File

@@ -2,7 +2,7 @@
source: tui/src/bottom_pane/chat_composer.rs
expression: terminal.backend()
---
"▌[Pasted Content 1002 chars][Pasted Content 1004 chars] "
"▌ [Pasted Content 1002 chars][Pasted Content 1004 chars] "
"▌ "
"▌ "
"▌ "
@@ -11,4 +11,4 @@ expression: terminal.backend()
"▌ "
"▌ "
" "
" ⏎ send ⌃J newline ⌃T transcript ⌃C quit "
"⏎ send ⌃J newline ⌃T transcript ⌃C quit "

2
codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__empty.snap
View File

@@ -11,4 +11,4 @@ expression: terminal.backend()
"▌ "
"▌ "
" "
" ⏎ send ⌃J newline ⌃T transcript ⌃C quit "
"⏎ send ⌃J newline ⌃T transcript ⌃C quit "

4
codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__large.snap
View File

@@ -2,7 +2,7 @@
source: tui/src/bottom_pane/chat_composer.rs
expression: terminal.backend()
---
"▌[Pasted Content 1005 chars] "
"▌ [Pasted Content 1005 chars] "
"▌ "
"▌ "
"▌ "
@@ -11,4 +11,4 @@ expression: terminal.backend()
"▌ "
"▌ "
" "
" ⏎ send ⌃J newline ⌃T transcript ⌃C quit "
"⏎ send ⌃J newline ⌃T transcript ⌃C quit "

4
codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__multiple_pastes.snap
View File

@@ -2,7 +2,7 @@
source: tui/src/bottom_pane/chat_composer.rs
expression: terminal.backend()
---
"▌[Pasted Content 1003 chars][Pasted Content 1007 chars] another short paste "
"▌ [Pasted Content 1003 chars][Pasted Content 1007 chars] another short paste "
"▌ "
"▌ "
"▌ "
@@ -11,4 +11,4 @@ expression: terminal.backend()
"▌ "
"▌ "
" "
" ⏎ send ⌃J newline ⌃T transcript ⌃C quit "
"⏎ send ⌃J newline ⌃T transcript ⌃C quit "

2
codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__slash_popup_mo.snap
View File

@@ -2,7 +2,7 @@
source: tui/src/bottom_pane/chat_composer.rs
expression: terminal.backend()
---
"▌/mo "
"▌ /mo "
"▌ "
"▌/model choose what model and reasoning effort to use "
"▌/mention mention a file "

4
codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__small.snap
View File

@@ -2,7 +2,7 @@
source: tui/src/bottom_pane/chat_composer.rs
expression: terminal.backend()
---
"▌short "
"▌ short "
"▌ "
"▌ "
"▌ "
@@ -11,4 +11,4 @@ expression: terminal.backend()
"▌ "
"▌ "
" "
" ⏎ send ⌃J newline ⌃T transcript ⌃C quit "
"⏎ send ⌃J newline ⌃T transcript ⌃C quit "