pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(scrolling): move clear scroll to scroll so that it works

Browse source
This commit is contained in:
Aram Drevekenin 2020-11-01 09:57:34 +01:00
parent fbeb7f09dc
commit ffb8979125
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/screen.rs
View file

@ -965,10 +965,7 @@ impl Screen {
pub fn clear_active_terminal_scroll(&mut self) { pub fn clear_active_terminal_scroll(&mut self) {
if let Some(active_terminal_id) = self.get_active_terminal_id() { if let Some(active_terminal_id) = self.get_active_terminal_id() {
let active_terminal = self.terminals.get_mut(&active_terminal_id).unwrap(); let active_terminal = self.terminals.get_mut(&active_terminal_id).unwrap();
if active_terminal.scroll_up_count.is_some() { active_terminal.clear_scroll();
active_terminal.clear_scroll();
self.render();
}
} }
} }
} }

11
src/terminal_pane.rs
View file

@ -966,6 +966,9 @@ impl Scroll {
} }
} }
} }
pub fn reset_viewport (&mut self) {
self.viewport_bottom_offset = None;
}
} }
impl Debug for Scroll { impl Debug for Scroll {
@ -983,7 +986,6 @@ pub struct TerminalOutput {
pub display_rows: u16, pub display_rows: u16,
pub display_cols: u16, pub display_cols: u16,
pub should_render: bool, pub should_render: bool,
pub scroll_up_count: Option<usize>,
pub x_coords: u16, pub x_coords: u16,
pub y_coords: u16, pub y_coords: u16,
pending_foreground_code: Option<AnsiCode>, pending_foreground_code: Option<AnsiCode>,
@ -1023,7 +1025,6 @@ impl TerminalOutput {
display_rows: ws.ws_row, display_rows: ws.ws_row,
display_cols: ws.ws_col, display_cols: ws.ws_col,
should_render: true, should_render: true,
scroll_up_count: None,
pending_foreground_code: None, pending_foreground_code: None,
pending_background_code: None, pending_background_code: None,
pending_bold_code: None, pending_bold_code: None,
@ -1167,10 +1168,8 @@ impl TerminalOutput {
self.should_render = true; self.should_render = true;
} }
pub fn clear_scroll(&mut self) { pub fn clear_scroll(&mut self) {
if self.scroll_up_count.is_some() { self.scroll.reset_viewport();
self.should_render = true; self.should_render = true;
}
self.scroll_up_count = None;
} }
fn add_newline (&mut self) { fn add_newline (&mut self) {
self.scroll.add_canonical_line(); // TODO: handle scroll region self.scroll.add_canonical_line(); // TODO: handle scroll region