diff options
| author | Christian Duerr <contact@christianduerr.com> | 2018-03-09 19:45:40 +0100 |
|---|---|---|
| committer | Joe Wilm <jwilm@users.noreply.github.com> | 2018-03-13 14:52:14 -0700 |
| commit | c1e831dab03bd1a48d2aa0f383aa5aaea2b3632b (patch) | |
| tree | 6521a6f386bcbe356b4462e827efd9565d159cb7 /src/term/mod.rs | |
| parent | 290e2cfb172565c3b80f207555397f57f1ef7fb0 (diff) | |
| download | alacritty-c1e831dab03bd1a48d2aa0f383aa5aaea2b3632b.tar.gz alacritty-c1e831dab03bd1a48d2aa0f383aa5aaea2b3632b.zip | |
Merge branch #1095
Because there was some overlap with branch #1095, these two PRs have
been added together and the config has been restructured to make use of
a `scrolling` section.
The default faux scrolling amount has also been changed to `3` because
this simplifies the code and falls in line with what most other terminal
emulators do.
There should be no additional test failures due to this.
Diffstat (limited to 'src/term/mod.rs')
| -rw-r--r-- | src/term/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/term/mod.rs b/src/term/mod.rs index 53bb3420..52d56ec8 100644 --- a/src/term/mod.rs +++ b/src/term/mod.rs @@ -847,7 +847,8 @@ impl Term { let num_cols = size.cols(); let num_lines = size.lines(); - let grid = Grid::new(num_lines, num_cols, config.scroll_history(), template); + let history_size = config.scrolling().history as usize; + let grid = Grid::new(num_lines, num_cols, history_size, template); let tabspaces = config.tabspaces(); let tabs = IndexRange::from(Column(0)..grid.num_cols()) |