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

repl: Make the terminal background transparent (#15022)

Browse source 
Keeps the background the same as the output area background by making
the terminal background be `Hsla::transparent_black()`.

Release Notes:

- N/A

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Kyle Kelley 2024-07-23 11:03:22 -07:00 • committed by GitHub
parent d0f52e90e6
commit 53b711c2b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 57 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

42
crates/repl/src/stdio.rs
View file

@ -61,11 +61,13 @@ impl TerminalOutput {
.iter()
.chain(Some(&self.handler.current_text_run))
.map(|ansi_run| {
let color = terminal_view::terminal_element::convert_color(&ansi_run.fg, theme);
let background_color = Some(terminal_view::terminal_element::convert_color(
&ansi_run.bg,
let color = terminal_view::terminal_element::convert_color(
&ansi_run.fg.unwrap_or(Color::Named(NamedColor::Foreground)),
theme,
));
);
let background_color = ansi_run
.bg
.map(|bg| terminal_view::terminal_element::convert_color(&bg, theme));
TextRun {
len: ansi_run.len,
@ -99,21 +101,11 @@ impl LineHeight for TerminalOutput {
}
}
#[derive(Clone)]
#[derive(Clone, Default)]
struct AnsiTextRun {
len: usize,
fg: alacritty_terminal::vte::ansi::Color,
bg: alacritty_terminal::vte::ansi::Color,
}
impl AnsiTextRun {
fn default() -> Self {
Self {
len: 0,
fg: Color::Named(NamedColor::Foreground),
bg: Color::Named(NamedColor::Background),
}
}
fg: Option<alacritty_terminal::vte::ansi::Color>,
bg: Option<alacritty_terminal::vte::ansi::Color>,
}
struct TerminalHandler {
@ -126,11 +118,7 @@ impl TerminalHandler {
fn new() -> Self {
Self {
text_runs: Vec::new(),
current_text_run: AnsiTextRun {
len: 0,
fg: Color::Named(NamedColor::Foreground),
bg: Color::Named(NamedColor::Background),
},
current_text_run: AnsiTextRun::default(),
buffer: String::new(),
}
}
@ -159,15 +147,11 @@ impl TerminalHandler {
self.text_runs.push(self.current_text_run.clone());
}
let mut text_run = AnsiTextRun {
len: 0,
fg: self.current_text_run.fg,
bg: self.current_text_run.bg,
};
let mut text_run = AnsiTextRun::default();
match attr {
Attr::Foreground(color) => text_run.fg = color,
Attr::Background(color) => text_run.bg = color,
Attr::Foreground(color) => text_run.fg = Some(color),
Attr::Background(color) => text_run.bg = Some(color),
_ => {}
}