Refactor codex card layout #4069
Merged
+69
−77
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nornagon-openai
requested changes
Sep 22, 2025
codex-rs/tui/src/history_cell.rs
Outdated
Comment on lines
637
to
684
| struct CodexCardLayout { | ||
| inner_width: usize, | ||
| } | ||
|
|
||
| impl CodexCardLayout { | ||
| fn new(width: u16, max_inner_width: usize) -> Option<Self> { | ||
| if width < 4 { | ||
| return None; | ||
| } | ||
| let inner_width = std::cmp::min(width.saturating_sub(2) as usize, max_inner_width); | ||
| Some(Self { inner_width }) | ||
| } | ||
|
|
||
| fn inner_width(&self) -> usize { | ||
| self.inner_width | ||
| } | ||
|
|
||
| fn top_border(&self) -> Line<'static> { | ||
| vec![Span::from(format!("╭{}╮", "─".repeat(self.inner_width))).dim()].into() | ||
| } | ||
|
|
||
| fn bottom_border(&self) -> Line<'static> { | ||
| vec![Span::from(format!("╰{}╯", "─".repeat(self.inner_width))).dim()].into() | ||
| } | ||
|
|
||
| fn blank_row(&self) -> Line<'static> { | ||
| self.row(Vec::new()) | ||
| } | ||
|
|
||
| fn row(&self, mut content: Vec<Span<'static>>) -> Line<'static> { | ||
| let used_width: usize = content | ||
| .iter() | ||
| .map(|span| UnicodeWidthStr::width(span.content.as_ref())) | ||
| .sum(); | ||
|
|
||
| if used_width < self.inner_width { | ||
| let padding = self.inner_width - used_width; | ||
| content.push(Span::from(" ".repeat(padding)).dim()); | ||
| } | ||
|
|
||
| let mut spans: Vec<Span<'static>> = Vec::with_capacity(content.len() + 2); | ||
| spans.push(Span::from("│").dim()); | ||
| spans.extend(content); | ||
| spans.push(Span::from("│").dim()); | ||
|
|
||
| Line::from(spans) | ||
| } | ||
| } |
There was a problem hiding this comment.
I think this could be a single function, fn with_border(lines: Vec<Line>) -> Vec<Line>.
There was a problem hiding this comment.
I think this gives us the ability to wrap long lines and handle them differently
codex-rs/tui/src/history_cell.rs
Outdated
| .unwrap_or(0); | ||
|
|
||
| let mut out = Vec::with_capacity(lines.len() + 2); | ||
| out.push(vec![Span::from(format!("╭{}╮", "─".repeat(inner_width))).dim()].into()); |
There was a problem hiding this comment.
I don't think we need Span::from() here, as .dim() will turn a String into a span.
codex-rs/tui/src/history_cell.rs
Outdated
Comment on lines
871
to
873
| if used_width < inner_width { | ||
| spans.push(Span::from(" ".repeat(inner_width - used_width)).dim()); | ||
| } |
There was a problem hiding this comment.
this is duplicative with with_border
codex-rs/tui/src/history_cell.rs
Outdated
Comment on lines
904
to
906
| model_spans.push(Span::from(" ").dim()); | ||
| model_spans.push(Span::from(CHANGE_MODEL_HINT_COMMAND).cyan()); | ||
| model_spans.push(Span::from(CHANGE_MODEL_HINT_EXPLANATION).dim()); |
There was a problem hiding this comment.
nit:
Suggested change
| model_spans.push(Span::from(" ").dim()); | |
| model_spans.push(Span::from(CHANGE_MODEL_HINT_COMMAND).cyan()); | |
| model_spans.push(Span::from(CHANGE_MODEL_HINT_EXPLANATION).dim()); | |
| model_spans.push(" ".dim()); | |
| model_spans.push(CHANGE_MODEL_HINT_COMMAND.cyan()); | |
| model_spans.push(CHANGE_MODEL_HINT_EXPLANATION.dim()); |
codex-rs/tui/src/history_cell.rs
Outdated
| .sum(); | ||
| let span_count = line.spans.len(); | ||
| let mut spans: Vec<Span<'static>> = Vec::with_capacity(span_count + 4); | ||
| spans.push(Span::from("│").dim()); |
| let mut title_spans: Vec<Span<'static>> = vec
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactor it to be used in status