Skip to content

fix(term): clamp menu scroll on render to survive terminal resize #15678

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

Closed
lmarkmann wants to merge 1 commit into from
+16 −1
Closed

fix(term): clamp menu scroll on render to survive terminal resize #15678

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: 16 additions & 1 deletion helix-term/src/ui/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use tui::{buffer::Buffer as Surface, widgets::Table};

pub use tui::widgets::{Cell, Row};

use helix_view::{editor::SmartTabConfig, graphics::Rect, Editor};
use helix_view::{Editor, editor::SmartTabConfig, graphics::Rect};
use tui::layout::Constraint;

pub trait Item: Sync + Send + 'static {
Expand Down Expand Up @@ -338,6 +338,21 @@ impl<T: Item + 'static> Component for Menu<T> {

surface.clear_with(area, style);

// Defensive clamp against terminal resize: `adjust_scroll` keeps the
// cursor within `self.size.1`, but a resize race can leave us
// rendering into a smaller `area.height` with `scroll` stale, so
// `cursor - scroll` underflows or goes past the end of `surface`.
// Re-clamp against the area we're actually about to draw into.
// Fixes #6382.
if let Some(cursor) = self.cursor {
let win_height = area.height as usize;
if cursor < self.scroll {
self.scroll = cursor;
} else if win_height > 0 && cursor >= self.scroll + win_height {
self.scroll = cursor + 1 - win_height;
}
}

let scroll = self.scroll;

let options: Vec<_> = self
Expand Down