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

fix(grid): only use background pending styling when deleting characters (#2204)

Browse source
This commit is contained in:
Aram Drevekenin 2023-02-28 18:21:37 +01:00 • committed by GitHub
parent afa9309c57
commit 73224ff272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2384,9 +2384,11 @@ impl Perform for Grid {
.unwrap_or(default) as usize .unwrap_or(default) as usize
}; };
if c == 'm' { if c == 'm' {
self.cursor if intermediates.is_empty() {
.pending_styles self.cursor
.add_style_from_ansi_params(&mut params_iter); .pending_styles
.add_style_from_ansi_params(&mut params_iter);
}
} else if c == 'C' || c == 'a' { } else if c == 'C' || c == 'a' {
// move cursor forward // move cursor forward
let move_by = next_param_or(1); let move_by = next_param_or(1);
@ -2394,13 +2396,13 @@ impl Perform for Grid {
} else if c == 'K' { } else if c == 'K' {
// clear line (0 => right, 1 => left, 2 => all) // clear line (0 => right, 1 => left, 2 => all)
if let Some(clear_type) = params_iter.next().map(|param| param[0]) { if let Some(clear_type) = params_iter.next().map(|param| param[0]) {
let mut char_to_replace = EMPTY_TERMINAL_CHARACTER;
if let Some(background_color) = self.cursor.pending_styles.background {
char_to_replace.styles.background = Some(background_color);
}
if clear_type == 0 { if clear_type == 0 {
let mut char_to_replace = EMPTY_TERMINAL_CHARACTER;
char_to_replace.styles = self.cursor.pending_styles;
self.replace_characters_in_line_after_cursor(char_to_replace); self.replace_characters_in_line_after_cursor(char_to_replace);
} else if clear_type == 1 { } else if clear_type == 1 {
let mut char_to_replace = EMPTY_TERMINAL_CHARACTER;
char_to_replace.styles = self.cursor.pending_styles;
self.replace_characters_in_line_before_cursor(char_to_replace); self.replace_characters_in_line_before_cursor(char_to_replace);
} else if clear_type == 2 { } else if clear_type == 2 {
self.clear_cursor_line(); self.clear_cursor_line();
@ -2409,8 +2411,9 @@ impl Perform for Grid {
} else if c == 'J' { } else if c == 'J' {
// clear all (0 => below, 1 => above, 2 => all, 3 => saved) // clear all (0 => below, 1 => above, 2 => all, 3 => saved)
let mut char_to_replace = EMPTY_TERMINAL_CHARACTER; let mut char_to_replace = EMPTY_TERMINAL_CHARACTER;
char_to_replace.styles = self.cursor.pending_styles; if let Some(background_color) = self.cursor.pending_styles.background {
char_to_replace.styles.background = Some(background_color);
}
if let Some(clear_type) = params_iter.next().map(|param| param[0]) { if let Some(clear_type) = params_iter.next().map(|param| param[0]) {
if clear_type == 0 { if clear_type == 0 {
self.clear_all_after_cursor(char_to_replace); self.clear_all_after_cursor(char_to_replace);