Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Render cursor text with the terminal's background color

Browse source
This commit is contained in:
Nathan Sobo 2023-12-27 11:08:43 -07:00
parent 5cfd4b06b9
commit ddd6f0806b
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/terminal_view2/src/terminal_element.rs
View file

@ -287,8 +287,8 @@ impl TerminalElement {
text_fragment.width text_fragment.width
}; };
//Cursor should always surround as much of the text as possible, // Cursor should always surround as much of the text as possible,
//hence when on pixel boundaries round the origin down and the width up // hence when on pixel boundaries round the origin down and the width up
Some(( Some((
point( point(
(cursor_point.col() as f32 * size.cell_width()).floor(), (cursor_point.col() as f32 * size.cell_width()).floor(),
@ -301,7 +301,7 @@ impl TerminalElement {
} }
} }
///Convert the Alacritty cell styles to GPUI text styles and background color /// Convert the Alacritty cell styles to GPUI text styles and background color
fn cell_style( fn cell_style(
indexed: &IndexedCell, indexed: &IndexedCell,
fg: terminal::alacritty_terminal::ansi::Color, fg: terminal::alacritty_terminal::ansi::Color,
@ -498,13 +498,6 @@ impl TerminalElement {
let cursor_point = DisplayCursor::from(cursor.point, *display_offset); let cursor_point = DisplayCursor::from(cursor.point, *display_offset);
let cursor_text = { let cursor_text = {
let str_trxt = cursor_char.to_string(); let str_trxt = cursor_char.to_string();
let color = if self.focused {
theme.players().local().background
} else {
theme.players().local().cursor
};
let len = str_trxt.len(); let len = str_trxt.len();
cx.text_system() cx.text_system()
.shape_line( .shape_line(
@ -513,7 +506,7 @@ impl TerminalElement {
&[TextRun { &[TextRun {
len, len,
font: text_style.font(), font: text_style.font(),
color, color: theme.colors().terminal_background,
background_color: None, background_color: None,
underline: Default::default(), underline: Default::default(),
}], }],