Skip to content
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

Jump to bottom

fix: prompt position on resize #578

Merged
merged 6 commits into from
May 24, 2023
Merged

fix: prompt position on resize #578

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f6953c
fix: prompt position on resize
Banyc Apr 29, 2023
657c2b4
fix: u16 overflow
Banyc Apr 29, 2023
f7b97d8
fix: prompt position when terminal grows in height
Banyc Apr 29, 2023
dfec061
fix: exclude blank area from prompt height
Banyc Apr 30, 2023
3dc28e0
fix: prevent any line overwriting at the cost of duplicate prompts
Banyc Apr 30, 2023
e7411c0
fix: prevent width change from eating previous output
Banyc Apr 30, 2023
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
35 changes: 20 additions & 15 deletions src/painting/painter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,22 +405,27 @@ impl Painter {
let prev_prompt_row = self.prompt_start_row;

self.terminal_size = (width, height);
// TODO properly adjusting prompt_origin on resizing while lines > 1

if prev_prompt_row >= (height - 1) {
// Terminal is shrinking up
// FIXME: use actual prompt size at some point
// Note: you can't just subtract the offset from the origin,
// as we could be shrinking so fast that the offset we read back from
// crossterm is past where it would have been.
self.prompt_start_row = height - 2;
} else if prev_terminal_size.1 < height {
// Terminal is growing down, so move the prompt down the same amount to make space
// for history that's on the screen
// Note: if the terminal doesn't have sufficient history, this will leave a trail
// of previous prompts currently.
self.prompt_start_row = prev_prompt_row + (height - prev_terminal_size.1);

if prev_prompt_row < height
&& height <= prev_terminal_size.1
&& width == prev_terminal_size.0
{
// The terminal got smaller in height but the start of the prompt is still visible
// The width didn't change
return;
}

// Either:
// - The terminal got larger in height
// - Note: if the terminal doesn't have sufficient history, this will leave a trail
// of previous prompts currently.
// - Note: if the the prompt contains multiple lines, this will leave a trail of
// previous prompts currently.
// - The terminal got smaller in height and the whole prompt is no longer visible
// - Note: if the the prompt contains multiple lines, this will leave a trail of
// previous prompts currently.
// - The width changed
self.prompt_start_row = height.saturating_sub(1);
}

/// Writes `line` to the terminal with a following carriage return and newline
Expand Down