diff options
| author | Christian Duerr <contact@christianduerr.com> | 2018-03-09 19:45:40 +0100 |
|---|---|---|
| committer | Joe Wilm <joe@jwilm.com> | 2018-06-02 09:44:58 -0700 |
| commit | d3f64072f3fe4d31f7a60eb0cb17a98096617b4b (patch) | |
| tree | 3b9e13888df43cff8a976e4edcf1f9be89d82023 /src/term | |
| parent | a2f127a5e65c8a6f4e1fc0bf79cc832d161a01b7 (diff) | |
| download | alacritty-d3f64072f3fe4d31f7a60eb0cb17a98096617b4b.tar.gz alacritty-d3f64072f3fe4d31f7a60eb0cb17a98096617b4b.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')
| -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 54c8a7e2..fd321fc6 100644 --- a/src/term/mod.rs +++ b/src/term/mod.rs @@ -848,7 +848,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()) |