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

fix(compatibility): docker-compose progress bar (#656)

Browse source 
* fix(compatibility): docker-compose progress bar

* docs(changelog): progress bar fix

* style(fmt): make rustfmt happy
This commit is contained in:
Aram Drevekenin 2021-08-23 20:55:31 +02:00 • committed by GitHub
parent 01c5378773
commit d969bbfea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* Fix various shells (eg. nushell) unexpectedly exiting when the user presses ctrl-c (https://github.com/zellij-org/zellij/pull/648) * Fix various shells (eg. nushell) unexpectedly exiting when the user presses ctrl-c (https://github.com/zellij-org/zellij/pull/648)
* Fix line wrapping while scrolling (https://github.com/zellij-org/zellij/pull/650) * Fix line wrapping while scrolling (https://github.com/zellij-org/zellij/pull/650)
* Indicate to the user when text is copied to the clipboard with the mouse (https://github.com/zellij-org/zellij/pull/642) * Indicate to the user when text is copied to the clipboard with the mouse (https://github.com/zellij-org/zellij/pull/642)
* Terminal compatibility: fix progress bar line overflow (http://github.com/zellij-org/zellij/pull/656)
## [0.15.0] - 2021-07-19 ## [0.15.0] - 2021-07-19
* Kill children properly (https://github.com/zellij-org/zellij/pull/601) * Kill children properly (https://github.com/zellij-org/zellij/pull/601)

24
zellij-server/src/panes/grid.rs
View file

@ -1068,26 +1068,18 @@ impl Grid {
} }
self.output_buffer.update_all_lines(); self.output_buffer.update_all_lines();
} }
pub fn move_cursor_down(&mut self, count: usize, pad_character: TerminalCharacter) { pub fn move_cursor_down_until_edge_of_screen(
&mut self,
count: usize,
pad_character: TerminalCharacter,
) {
if let Some((scroll_region_top, scroll_region_bottom)) = self.scroll_region { if let Some((scroll_region_top, scroll_region_bottom)) = self.scroll_region {
if self.cursor.y >= scroll_region_top && self.cursor.y <= scroll_region_bottom { if self.cursor.y >= scroll_region_top && self.cursor.y <= scroll_region_bottom {
self.cursor.y = std::cmp::min(self.cursor.y + count, scroll_region_bottom); self.cursor.y = std::cmp::min(self.cursor.y + count, scroll_region_bottom);
return; return;
} }
} }
let lines_to_add = if self.cursor.y + count > self.height - 1 { self.cursor.y = std::cmp::min(self.cursor.y + count, self.height - 1);
(self.cursor.y + count) - (self.height - 1)
} else {
0
};
self.cursor.y = if self.cursor.y + count > self.height - 1 {
self.height - 1
} else {
self.cursor.y + count
};
for _ in 0..lines_to_add {
self.add_canonical_line();
}
self.pad_lines_until(self.cursor.y, pad_character); self.pad_lines_until(self.cursor.y, pad_character);
} }
pub fn move_cursor_back(&mut self, count: usize) { pub fn move_cursor_back(&mut self, count: usize) {
@ -1626,7 +1618,7 @@ impl Perform for Grid {
// move cursor down until edge of screen // move cursor down until edge of screen
let move_down_count = next_param_or(1); let move_down_count = next_param_or(1);
let pad_character = EMPTY_TERMINAL_CHARACTER; let pad_character = EMPTY_TERMINAL_CHARACTER;
self.move_cursor_down(move_down_count as usize, pad_character); self.move_cursor_down_until_edge_of_screen(move_down_count as usize, pad_character);
} else if c == 'D' { } else if c == 'D' {
let move_back_count = next_param_or(1); let move_back_count = next_param_or(1);
self.move_cursor_back(move_back_count); self.move_cursor_back(move_back_count);
@ -1806,7 +1798,7 @@ impl Perform for Grid {
} else if c == 'E' { } else if c == 'E' {
let count = next_param_or(1); let count = next_param_or(1);
let pad_character = EMPTY_TERMINAL_CHARACTER; let pad_character = EMPTY_TERMINAL_CHARACTER;
self.move_cursor_down(count, pad_character); self.move_cursor_down_until_edge_of_screen(count, pad_character);
} else if c == 'F' { } else if c == 'F' {
let count = next_param_or(1); let count = next_param_or(1);
self.move_cursor_up(count); self.move_cursor_up(count);