diff options
| author | Kirill Chibisov <contact@kchibisov.com> | 2020-01-20 23:03:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 23:03:54 +0300 |
| commit | 2f1a390aaad188d1cad9fc689620ae90e027cc8a (patch) | |
| tree | 37ecb2bd335f1604c4d6cd427a5366ff43035d18 /alacritty_terminal | |
| parent | fb1d3bef3f45e64a06e5db16f5b21cfa2aacb4df (diff) | |
| download | alacritty-2f1a390aaad188d1cad9fc689620ae90e027cc8a.tar.gz alacritty-2f1a390aaad188d1cad9fc689620ae90e027cc8a.zip | |
Remove scrolling.auto_scroll feature
Fixes: #1873
Diffstat (limited to 'alacritty_terminal')
| -rw-r--r-- | alacritty_terminal/src/config/scrolling.rs | 4 | ||||
| -rw-r--r-- | alacritty_terminal/src/term/mod.rs | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/alacritty_terminal/src/config/scrolling.rs b/alacritty_terminal/src/config/scrolling.rs index 1746266f..358abc3b 100644 --- a/alacritty_terminal/src/config/scrolling.rs +++ b/alacritty_terminal/src/config/scrolling.rs @@ -11,8 +11,10 @@ pub struct Scrolling { history: ScrollingHistory, #[serde(deserialize_with = "failure_default")] multiplier: ScrollingMultiplier, + + // TODO: REMOVED #[serde(deserialize_with = "failure_default")] - pub auto_scroll: bool, + pub auto_scroll: Option<bool>, // TODO: DEPRECATED #[serde(deserialize_with = "failure_default")] diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs index 8edf3d3f..9cd1f75b 100644 --- a/alacritty_terminal/src/term/mod.rs +++ b/alacritty_terminal/src/term/mod.rs @@ -775,9 +775,6 @@ pub struct Term<T> { /// Number of spaces in one tab tabspaces: usize, - /// Automatically scroll to bottom when new lines are added - auto_scroll: bool, - /// Clipboard access coupled to the active window clipboard: Clipboard, @@ -911,7 +908,6 @@ impl<T> Term<T> { default_cursor_style: config.cursor.style, dynamic_title: config.dynamic_title(), tabspaces, - auto_scroll: config.scrolling.auto_scroll, clipboard, event_proxy, is_focused: true, @@ -936,7 +932,6 @@ impl<T> Term<T> { } self.default_cursor_style = config.cursor.style; self.dynamic_title = config.dynamic_title(); - self.auto_scroll = config.scrolling.auto_scroll; self.grid.update_history(config.scrolling.history() as usize, &self.cursor.template); } @@ -1299,11 +1294,6 @@ impl<T: EventListener> Handler for Term<T> { /// A character to be displayed #[inline] fn input(&mut self, c: char) { - // If enabled, scroll to bottom when character is received - if self.auto_scroll { - self.scroll_display(Scroll::Bottom); - } - // Number of cells the char will occupy let width = match c.width() { Some(width) => width, |