icons: default to ambient text color when unset
This commit is contained in:
@@ -532,7 +532,7 @@ enum Glyph {
|
||||
Named(SharedString),
|
||||
}
|
||||
|
||||
/// An icon element. Unpainted unless a color is set.
|
||||
/// An icon element. Painted with the ambient text color unless a color is set.
|
||||
#[derive(Clone, IntoElement)]
|
||||
pub struct Icon {
|
||||
glyph: Glyph,
|
||||
@@ -681,16 +681,19 @@ where
|
||||
}
|
||||
|
||||
impl RenderOnce for Icon {
|
||||
fn render(self, _window: &mut Window, _cx: &mut gpui::App) -> impl IntoElement {
|
||||
fn render(self, window: &mut Window, _cx: &mut gpui::App) -> impl IntoElement {
|
||||
let Icon {
|
||||
glyph,
|
||||
size,
|
||||
color,
|
||||
transformation,
|
||||
} = self;
|
||||
|
||||
let color = color.unwrap_or_else(|| window.text_style().color);
|
||||
|
||||
match glyph {
|
||||
Glyph::Named(path) => Self::render_svg_path(size, color, transformation, path),
|
||||
Glyph::Role(role) => Self::render_role(size, color, transformation, role),
|
||||
Glyph::Named(path) => Self::render_svg_path(size, Some(color), transformation, path),
|
||||
Glyph::Role(role) => Self::render_role(size, Some(color), transformation, role),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user