dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

icon: Fix icon to support style size. (#693)

Browse source
This commit is contained in:
Jason Lee 2025-03-07 10:52:57 +08:00 committed by GitHub
parent 3a4f442945
commit bf1420357b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crates/ui/src/icon.rs
View file

@ -187,6 +187,7 @@ impl RenderOnce for IconName {
#[derive(IntoElement)] #[derive(IntoElement)]
pub struct Icon { pub struct Icon {
base: Svg, base: Svg,
style: StyleRefinement,
path: SharedString, path: SharedString,
text_color: Option<Hsla>, text_color: Option<Hsla>,
size: Option<Size>, size: Option<Size>,
@ -197,6 +198,7 @@ impl Default for Icon {
fn default() -> Self { fn default() -> Self {
Self { Self {
base: svg().flex_none().size_4(), base: svg().flex_none().size_4(),
style: StyleRefinement::default(),
path: "".into(), path: "".into(),
text_color: None, text_color: None,
size: None, size: None,
@ -261,7 +263,7 @@ impl Icon {
impl Styled for Icon { impl Styled for Icon {
fn style(&mut self) -> &mut StyleRefinement { fn style(&mut self) -> &mut StyleRefinement {
self.base.style() &mut self.style
} }
fn text_color(mut self, color: impl Into<Hsla>) -> Self { fn text_color(mut self, color: impl Into<Hsla>) -> Self {
@ -281,10 +283,13 @@ impl RenderOnce for Icon {
fn render(self, window: &mut Window, _cx: &mut App) -> impl IntoElement { fn render(self, window: &mut Window, _cx: &mut App) -> impl IntoElement {
let text_color = self.text_color.unwrap_or_else(|| window.text_style().color); let text_color = self.text_color.unwrap_or_else(|| window.text_style().color);
let text_size = window.text_style().font_size.to_pixels(window.rem_size()); let text_size = window.text_style().font_size.to_pixels(window.rem_size());
let has_base_size = self.style.size.width.is_some() || self.style.size.height.is_some();
self.base let mut base = self.base;
.text_color(text_color) *base.style() = self.style;
.size(text_size)
base.text_color(text_color)
.when(!has_base_size, |this| this.size(text_size))
.when_some(self.size, |this, size| match size { .when_some(self.size, |this, size| match size {
Size::Size(px) => this.size(px), Size::Size(px) => this.size(px),
Size::XSmall => this.size_3(), Size::XSmall => this.size_3(),
@ -306,11 +311,13 @@ impl Render for Icon {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement { fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let text_color = self.text_color.unwrap_or_else(|| cx.theme().foreground); let text_color = self.text_color.unwrap_or_else(|| cx.theme().foreground);
let text_size = window.text_style().font_size.to_pixels(window.rem_size()); let text_size = window.text_style().font_size.to_pixels(window.rem_size());
let has_base_size = self.style.size.width.is_some() || self.style.size.height.is_some();
svg() let mut base = svg().flex_none();
.flex_none() *base.style() = self.style.clone();
.text_color(text_color)
.size(text_size) base.text_color(text_color)
.when(!has_base_size, |this| this.size(text_size))
.when_some(self.size, |this, size| match size { .when_some(self.size, |this, size| match size {
Size::Size(px) => this.size(px), Size::Size(px) => this.size(px),
Size::XSmall => this.size_3(), Size::XSmall => this.size_3(),