diff options
| author | Christian Duerr <chrisduerr@users.noreply.github.com> | 2019-03-02 18:32:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-02 18:32:48 +0000 |
| commit | 3c4bb7c11518e1ced9feeb156436d55fe1d4a66b (patch) | |
| tree | 982ed81edc2bb9bea6b21dfc461fe8a509e78963 | |
| parent | e0fdc3329c4ca06e5853401e9c7c04f16b28eba3 (diff) | |
| download | alacritty-3c4bb7c11518e1ced9feeb156436d55fe1d4a66b.tar.gz alacritty-3c4bb7c11518e1ced9feeb156436d55fe1d4a66b.zip | |
Fix scrollback live reloading
This fixes two issues with live reloading the `scrolling.history`
property.
It is now possible to increase the scrollback history without restarting
Alacritty.
When decreasing the scrollback history while scrolled beyond the new
history limit, Alacritty will reset the viewport position to the new
limit instead of crashing.
This fixes #2147.
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/grid/mod.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ca6a9f8..dc220abf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix panic which could occur when quitting Alacritty on Windows if using the Conpty backend - Automatic copying of selection to clipboard when mouse is released outside of Alacritty +- Scrollback history live reload only working when shrinking lines +- Crash when decreasing scrollback history in config while scrolled in history ## Version 0.2.9 diff --git a/src/grid/mod.rs b/src/grid/mod.rs index fd22b716..7766f9a9 100644 --- a/src/grid/mod.rs +++ b/src/grid/mod.rs @@ -163,7 +163,9 @@ impl<T: Copy + Clone> Grid<T> { pub fn update_history(&mut self, history_size: usize, template: &T) { self.raw.update_history(history_size, Row::new(self.cols, &template)); + self.max_scroll_limit = history_size; self.scroll_limit = min(self.scroll_limit, history_size); + self.display_offset = min(self.display_offset, self.scroll_limit); } pub fn scroll_display(&mut self, scroll: Scroll) { |