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

Make all HighlightStyle properties optional

Browse source 
Previously, some of those properties such the font weight, style and color
would be mandatory: when the theme didn't specify them, Zed would use a default
value during deserialization. This meant that those default properties would
unconditionally override the base text style, causing a rendering bug when
combining syntax highlights with diagnostic styles.

This commit fixes that by making `HighlightStyle`s more additive: each property
can be set independently and only the properties that theme specifies get
overridden in the base text style.
This commit is contained in:
Antonio Scandurra 2022-03-15 10:39:43 +01:00
parent 72692f1700
commit fbf7cdf4f2
10 changed files with 149 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/gpui/src/text_layout.rs
View file

@ -28,7 +28,7 @@ pub struct TextLayoutCache {
pub struct RunStyle {
pub color: Color,
pub font_id: FontId,
pub underline: Option<Underline>,
pub underline: Underline,
}
impl TextLayoutCache {
@ -167,7 +167,7 @@ impl<'a> Hash for CacheKeyRef<'a> {
#[derive(Default, Debug)]
pub struct Line {
layout: Arc<LineLayout>,
style_runs: SmallVec<[(u32, Color, Option<Underline>); 32]>,
style_runs: SmallVec<[(u32, Color, Underline); 32]>,
}
#[derive(Default, Debug)]
@ -283,17 +283,21 @@ impl Line {
if glyph.index >= run_end {
if let Some((run_len, run_color, run_underline)) = style_runs.next() {
if let Some((_, underline_style)) = underline {
if *run_underline != Some(underline_style) {
if *run_underline != underline_style {
finished_underline = underline.take();
}
}
if let Some(run_underline) = run_underline {
if run_underline.thickness.into_inner() > 0. {
underline.get_or_insert((
vec2f(
glyph_origin.x(),
origin.y() + baseline_offset.y() + 0.618 * self.layout.descent,
),
*run_underline,
Underline {
color: Some(run_underline.color.unwrap_or(*run_color)),
thickness: run_underline.thickness.into(),
squiggly: run_underline.squiggly,
},
));
}
@ -301,7 +305,6 @@ impl Line {
color = *run_color;
} else {
run_end = self.layout.len;
color = Color::black();
finished_underline = underline.take();
}
}
@ -315,7 +318,7 @@ impl Line {
origin: underline_origin,
width: glyph_origin.x() - underline_origin.x(),
thickness: underline_style.thickness.into(),
color: underline_style.color,
color: underline_style.color.unwrap(),
squiggly: underline_style.squiggly,
});
}
@ -335,7 +338,7 @@ impl Line {
cx.scene.push_underline(scene::Underline {
origin: underline_start,
width: line_end_x - underline_start.x(),
color: underline_style.color,
color: underline_style.color.unwrap(),
thickness: underline_style.thickness.into(),
squiggly: underline_style.squiggly,
});
@ -610,7 +613,7 @@ impl LineWrapper {
RunStyle {
font_id: self.font_id,
color: Default::default(),
underline: None,
underline: Default::default(),
},
)],
)
@ -694,7 +697,7 @@ mod tests {
let normal = RunStyle {
font_id,
color: Default::default(),
underline: None,
underline: Default::default(),
};
let bold = RunStyle {
font_id: font_cache
@ -707,7 +710,7 @@ mod tests {
)
.unwrap(),
color: Default::default(),
underline: None,
underline: Default::default(),
};
let text = "aa bbb cccc ddddd eeee";