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

Fix selection backgrounds

Browse source
This commit is contained in:
Mikayla 2023-12-06 16:25:50 -08:00
parent 22cd62213b
commit 66b93212fe
No known key found for this signature in database
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -261,7 +261,6 @@ impl TerminalElement {
let cell_style = TerminalElement::cell_style( let cell_style = TerminalElement::cell_style(
&cell, &cell,
fg, fg,
bg,
theme, theme,
text_style, text_style,
text_system, text_system,
@ -274,7 +273,6 @@ impl TerminalElement {
text_style.font_size.to_pixels(cx.rem_size()), text_style.font_size.to_pixels(cx.rem_size()),
&[cell_style], &[cell_style],
) )
//todo!() Can we remove this unwrap?
.unwrap(); .unwrap();
cells.push(LayoutCell::new( cells.push(LayoutCell::new(
@ -324,7 +322,7 @@ impl TerminalElement {
fn cell_style( fn cell_style(
indexed: &IndexedCell, indexed: &IndexedCell,
fg: terminal::alacritty_terminal::ansi::Color, fg: terminal::alacritty_terminal::ansi::Color,
bg: terminal::alacritty_terminal::ansi::Color, // bg: terminal::alacritty_terminal::ansi::Color,
colors: &Theme, colors: &Theme,
text_style: &TextStyle, text_style: &TextStyle,
text_system: &TextSystem, text_system: &TextSystem,
@ -332,7 +330,7 @@ impl TerminalElement {
) -> TextRun { ) -> TextRun {
let flags = indexed.cell.flags; let flags = indexed.cell.flags;
let fg = convert_color(&fg, &colors); let fg = convert_color(&fg, &colors);
let bg = convert_color(&bg, &colors); // let bg = convert_color(&bg, &colors);
let underline = (flags.intersects(Flags::ALL_UNDERLINES) let underline = (flags.intersects(Flags::ALL_UNDERLINES)
|| indexed.cell.hyperlink().is_some()) || indexed.cell.hyperlink().is_some())
@ -357,7 +355,7 @@ impl TerminalElement {
let mut result = TextRun { let mut result = TextRun {
len: indexed.c.len_utf8() as usize, len: indexed.c.len_utf8() as usize,
color: fg, color: fg,
background_color: Some(bg), background_color: None,
font: Font { font: Font {
weight, weight,
style, style,
@ -384,10 +382,6 @@ impl TerminalElement {
fn compute_layout(&self, bounds: Bounds<gpui::Pixels>, cx: &mut WindowContext) -> LayoutState { fn compute_layout(&self, bounds: Bounds<gpui::Pixels>, cx: &mut WindowContext) -> LayoutState {
let settings = ThemeSettings::get_global(cx).clone(); let settings = ThemeSettings::get_global(cx).clone();
//Setup layout information
// todo!(Terminal tooltips)
// let tooltip_style = settings.theme.tooltip.clone();
let buffer_font_size = settings.buffer_font_size(cx); let buffer_font_size = settings.buffer_font_size(cx);
let terminal_settings = TerminalSettings::get_global(cx); let terminal_settings = TerminalSettings::get_global(cx);