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

Correctly use the base element in HighlightedLabel (#7397)

Browse source 
This PR updates the `HighlightedLabel` to correctly render its base
element, which is the one that receives the styling properties, instead
of rendering a new `LabelLike`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-02-05 13:21:07 -05:00 • committed by GitHub
parent 8911e1b365
commit ce62404e24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ui/src/components/label/highlighted_label.rs
View file

@ -79,8 +79,7 @@ impl RenderOnce for HighlightedLabel {
let mut text_style = cx.text_style().clone(); let mut text_style = cx.text_style().clone();
text_style.color = self.base.color.color(cx); text_style.color = self.base.color.color(cx);
LabelLike::new() self.base
.size(self.base.size)
.child(StyledText::new(self.label).with_highlights(&text_style, highlights)) .child(StyledText::new(self.label).with_highlights(&text_style, highlights))
} }
} }

2
crates/ui/src/components/label/label_like.rs
View file

@ -36,7 +36,7 @@ pub trait LabelCommon {
#[derive(IntoElement)] #[derive(IntoElement)]
pub struct LabelLike { pub struct LabelLike {
pub(crate) size: LabelSize, size: LabelSize,
line_height_style: LineHeightStyle, line_height_style: LineHeightStyle,
pub(crate) color: Color, pub(crate) color: Color,
strikethrough: bool, strikethrough: bool,