mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
Remove terminal resize reflow flag gates (#27794)
## Why `terminal_resize_reflow` is now stable and should behave as always on. Keeping the disabled runtime paths around made the feature look configurable even though the rollout is complete, and old config could still suggest there was a supported off mode. ## What Changed - Marked `terminal_resize_reflow` as `Stage::Removed` while keeping it default-enabled for compatibility. - Ignored `[features].terminal_resize_reflow` config entries so stale `false` settings no longer affect the effective feature set. - Removed TUI branches that depended on the flag being disabled, so draw, replay buffering, stream finalization, and resize scheduling all assume resize reflow is active. - Simplified resize smoke coverage to exercise the always-on behavior only. ## Verification - `just test -p codex-features` - `just test -p codex-tui resize_reflow` - `just test -p codex-tui initial_replay_buffer thread_switch_replay_buffer`
This commit is contained in:
1 parent
1aa3e432cc
commit
8a6a039f26
11 files changed
+86
-272
No files matched your search
+14
-42
@@ -1248,16 +1248,8 @@ See the Codex keymap documentation for supported actions and examples."
|
||||
app_server: &mut AppServerSession,
|
||||
event: TuiEvent,
|
||||
) -> Result<AppRunControl> {
|
||||
let terminal_resize_reflow_enabled = self.terminal_resize_reflow_enabled();
|
||||
if self.should_handle_draw_pre_render()
|
||||
&& matches!(event, TuiEvent::Draw | TuiEvent::Resize)
|
||||
{
|
||||
if matches!(event, TuiEvent::Draw | TuiEvent::Resize) {
|
||||
self.handle_draw_pre_render(tui)?;
|
||||
} else if matches!(event, TuiEvent::Draw | TuiEvent::Resize) {
|
||||
let size = tui.terminal.size()?;
|
||||
if size != tui.terminal.last_known_screen_size {
|
||||
self.refresh_status_line();
|
||||
}
|
||||
}
|
||||
|
||||
if self.overlay.is_some() {
|
||||
@@ -1289,8 +1281,7 @@ See the Codex keymap documentation for supported actions and examples."
|
||||
}
|
||||
// Allow widgets to process any pending timers before rendering.
|
||||
self.chat_widget.pre_draw_tick();
|
||||
let rendered_area =
|
||||
self.render_chat_widget_frame(tui, terminal_resize_reflow_enabled)?;
|
||||
let rendered_area = self.render_chat_widget_frame(tui)?;
|
||||
if self.chat_widget.ambient_pet_image_enabled() {
|
||||
let terminal_size = tui.terminal.size()?;
|
||||
let ambient_pet_area = Rect::new(
|
||||
@@ -1329,43 +1320,24 @@ See the Codex keymap documentation for supported actions and examples."
|
||||
pub(super) fn show_shutdown_feedback(&mut self, tui: &mut tui::Tui) -> Result<()> {
|
||||
self.disable_ambient_pet_before_shutdown(tui)?;
|
||||
self.chat_widget.show_shutdown_in_progress();
|
||||
let terminal_resize_reflow_enabled = self.terminal_resize_reflow_enabled();
|
||||
if self.should_handle_draw_pre_render() {
|
||||
self.handle_draw_pre_render(tui)?;
|
||||
}
|
||||
self.handle_draw_pre_render(tui)?;
|
||||
self.chat_widget.pre_draw_tick();
|
||||
self.render_chat_widget_frame(tui, terminal_resize_reflow_enabled)?;
|
||||
self.render_chat_widget_frame(tui)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn render_chat_widget_frame(
|
||||
&mut self,
|
||||
tui: &mut tui::Tui,
|
||||
terminal_resize_reflow_enabled: bool,
|
||||
) -> Result<Rect> {
|
||||
fn render_chat_widget_frame(&mut self, tui: &mut tui::Tui) -> Result<Rect> {
|
||||
let desired_height = self.chat_widget.desired_height(tui.terminal.size()?.width);
|
||||
let mut rendered_area = Rect::default();
|
||||
if terminal_resize_reflow_enabled {
|
||||
tui.draw_with_resize_reflow(desired_height, |frame| {
|
||||
let area = frame.area();
|
||||
rendered_area = area;
|
||||
self.chat_widget.render(area, frame.buffer);
|
||||
if let Some((x, y)) = self.chat_widget.cursor_pos(area) {
|
||||
frame.set_cursor_style(self.chat_widget.cursor_style(area));
|
||||
frame.set_cursor_position((x, y));
|
||||
}
|
||||
})?;
|
||||
} else {
|
||||
tui.draw(desired_height, |frame| {
|
||||
let area = frame.area();
|
||||
rendered_area = area;
|
||||
self.chat_widget.render(area, frame.buffer);
|
||||
if let Some((x, y)) = self.chat_widget.cursor_pos(area) {
|
||||
frame.set_cursor_style(self.chat_widget.cursor_style(area));
|
||||
frame.set_cursor_position((x, y));
|
||||
}
|
||||
})?;
|
||||
}
|
||||
tui.draw_with_resize_reflow(desired_height, |frame| {
|
||||
let area = frame.area();
|
||||
rendered_area = area;
|
||||
self.chat_widget.render(area, frame.buffer);
|
||||
if let Some((x, y)) = self.chat_widget.cursor_pos(area) {
|
||||
frame.set_cursor_style(self.chat_widget.cursor_style(area));
|
||||
frame.set_cursor_position((x, y));
|
||||
}
|
||||
})?;
|
||||
Ok(rendered_area)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user