diff options
| -rw-r--r-- | src/grid/mod.rs | 17 | ||||
| -rw-r--r-- | src/grid/storage.rs | 11 |
2 files changed, 22 insertions, 6 deletions
diff --git a/src/grid/mod.rs b/src/grid/mod.rs index 15ddf30e..e42e5cfa 100644 --- a/src/grid/mod.rs +++ b/src/grid/mod.rs @@ -211,7 +211,10 @@ impl<T: Copy + Clone> Grid<T> { } fn increase_scroll_limit(&mut self, count: usize) { - self.scroll_limit = min(self.scroll_limit + count, self.raw.len() - *self.lines); + self.scroll_limit = min( + self.scroll_limit + count, + self.raw.len().saturating_sub(*self.lines), + ); } fn decrease_scroll_limit(&mut self, count: usize) { @@ -240,6 +243,13 @@ impl<T: Copy + Clone> Grid<T> { self.raw.set_visible_lines(new_line_count); self.lines = new_line_count; + // Fill up the history with empty lines + if self.raw.len() < self.raw.capacity() { + for _ in self.raw.len()..self.raw.capacity() { + self.raw.push(Row::new(self.cols, &template)); + } + } + // Add new lines to bottom self.scroll_up(&(Line(0)..new_line_count), lines_added, template); @@ -263,11 +273,6 @@ impl<T: Copy + Clone> Grid<T> { /// /// Alacritty takes the same approach. fn shrink_lines(&mut self, target: index::Line) { - // TODO handle disabled scrollback - // while index::Line(self.raw.len()) != lines { - // self.raw.pop(); - // } - let prev = self.lines; self.selection = None; diff --git a/src/grid/storage.rs b/src/grid/storage.rs index b620b9c0..cc32d6d1 100644 --- a/src/grid/storage.rs +++ b/src/grid/storage.rs @@ -48,6 +48,17 @@ impl<T> Storage<T> { } pub fn set_visible_lines(&mut self, next: Line) { + // Change capacity to fit scrollback + screen size + if next > self.visible_lines + 1 { + self.inner.reserve_exact((next - (self.visible_lines + 1)).0); + } else if next < self.visible_lines + 1 { + let shrinkage = (self.visible_lines + 1 - next).0; + let new_size = self.inner.capacity() - shrinkage; + self.inner.truncate(new_size); + self.inner.shrink_to_fit(); + } + + // Update visible lines self.visible_lines = next - 1; } |