mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fixed styles

Browse source
This commit is contained in:
Mikayla Maki 2022-08-02 17:31:40 -07:00
parent 2a5eafcc61
commit 86406153bd
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/terminal/src/connected_el.rs
View file

@ -368,14 +368,7 @@ impl TerminalEl {
let fg = convert_color(&fg, &style.colors, modal);
let underline = flags
.contains(
Flags::UNDERLINE
| Flags::DOUBLE_UNDERLINE
| Flags::DOTTED_UNDERLINE
| Flags::DASHED_UNDERLINE
| Flags::UNDERCURL
| Flags::ALL_UNDERLINES,
)
.intersects(Flags::ALL_UNDERLINES)
.then(|| Underline {
color: Some(fg),
squiggly: flags.contains(Flags::UNDERCURL),
@ -386,11 +379,11 @@ impl TerminalEl {
let mut properties = Properties::new();
if indexed
.flags
.contains(Flags::BOLD | Flags::BOLD_ITALIC | Flags::DIM_BOLD)
.intersects(Flags::BOLD | Flags::BOLD_ITALIC | Flags::DIM_BOLD)
{
properties = *properties.weight(Weight::BOLD);
}
if indexed.flags.contains(Flags::ITALIC | Flags::BOLD_ITALIC) {
if indexed.flags.intersects(Flags::ITALIC | Flags::BOLD_ITALIC) {
properties = *properties.style(Italic);
}
@ -598,12 +591,13 @@ impl Element for TerminalEl {
cells.extend(
content
.display_iter
.filter(|ic| {
!ic.flags.contains(Flags::HIDDEN)
&& !(ic.bg == Named(NamedColor::Background)
&& ic.c == ' '
&& !ic.flags.contains(Flags::INVERSE))
})
//TODO: Add this once there's a way to retain empty lines
// .filter(|ic| {
// !ic.flags.contains(Flags::HIDDEN)
// && !(ic.bg == Named(NamedColor::Background)
// && ic.c == ' '
// && !ic.flags.contains(Flags::INVERSE))
// })
.map(|ic| IndexedCell {
point: ic.point.clone(),
cell: ic.cell.clone(),