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

Better disabled style for ghost button (#102)

Browse source
This commit is contained in:
Floyd Wang 2024-08-02 18:20:08 +08:00 committed by GitHub
parent e784f98a38
commit 48c452e6f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/ui/src/button.rs
View file

@ -383,9 +383,7 @@ impl ButtonStyle {
ButtonStyle::Primary => cx.theme().primary, ButtonStyle::Primary => cx.theme().primary,
ButtonStyle::Secondary => cx.theme().secondary, ButtonStyle::Secondary => cx.theme().secondary,
ButtonStyle::Danger => cx.theme().destructive, ButtonStyle::Danger => cx.theme().destructive,
ButtonStyle::Outline => cx.theme().transparent, ButtonStyle::Outline | ButtonStyle::Ghost | ButtonStyle::Link => cx.theme().transparent,
ButtonStyle::Ghost => cx.theme().transparent,
ButtonStyle::Link => cx.theme().transparent,
ButtonStyle::Custom(colors) => colors.color, ButtonStyle::Custom(colors) => colors.color,
} }
} }
@ -393,10 +391,10 @@ impl ButtonStyle {
fn text_color(&self, cx: &WindowContext) -> Hsla { fn text_color(&self, cx: &WindowContext) -> Hsla {
match self { match self {
ButtonStyle::Primary => cx.theme().primary_foreground, ButtonStyle::Primary => cx.theme().primary_foreground,
ButtonStyle::Secondary => cx.theme().secondary_foreground, ButtonStyle::Secondary | ButtonStyle::Outline | ButtonStyle::Ghost => {
cx.theme().secondary_foreground
}
ButtonStyle::Danger => cx.theme().destructive_foreground, ButtonStyle::Danger => cx.theme().destructive_foreground,
ButtonStyle::Outline => cx.theme().secondary_foreground,
ButtonStyle::Ghost => cx.theme().secondary_foreground,
ButtonStyle::Link => cx.theme().link, ButtonStyle::Link => cx.theme().link,
ButtonStyle::Custom(colors) => colors.foreground, ButtonStyle::Custom(colors) => colors.foreground,
} }
@ -408,8 +406,7 @@ impl ButtonStyle {
ButtonStyle::Secondary => cx.theme().border, ButtonStyle::Secondary => cx.theme().border,
ButtonStyle::Danger => cx.theme().destructive, ButtonStyle::Danger => cx.theme().destructive,
ButtonStyle::Outline => cx.theme().border, ButtonStyle::Outline => cx.theme().border,
ButtonStyle::Ghost => cx.theme().transparent, ButtonStyle::Ghost | ButtonStyle::Link => cx.theme().transparent,
ButtonStyle::Link => cx.theme().transparent,
ButtonStyle::Custom(colors) => colors.border, ButtonStyle::Custom(colors) => colors.border,
} }
} }
@ -438,9 +435,8 @@ impl ButtonStyle {
fn hovered(&self, cx: &WindowContext) -> ButtonStyles { fn hovered(&self, cx: &WindowContext) -> ButtonStyles {
let bg = match self { let bg = match self {
ButtonStyle::Primary => cx.theme().primary_hover, ButtonStyle::Primary => cx.theme().primary_hover,
ButtonStyle::Secondary => cx.theme().secondary_hover, ButtonStyle::Secondary | ButtonStyle::Outline => cx.theme().secondary_hover,
ButtonStyle::Danger => cx.theme().destructive_hover, ButtonStyle::Danger => cx.theme().destructive_hover,
ButtonStyle::Outline => cx.theme().secondary_hover,
ButtonStyle::Ghost => cx.theme().secondary, ButtonStyle::Ghost => cx.theme().secondary,
ButtonStyle::Link => cx.theme().transparent, ButtonStyle::Link => cx.theme().transparent,
ButtonStyle::Custom(colors) => colors.hover, ButtonStyle::Custom(colors) => colors.hover,
@ -463,10 +459,10 @@ impl ButtonStyle {
fn active(&self, cx: &WindowContext) -> ButtonStyles { fn active(&self, cx: &WindowContext) -> ButtonStyles {
let bg = match self { let bg = match self {
ButtonStyle::Primary => cx.theme().primary_active, ButtonStyle::Primary => cx.theme().primary_active,
ButtonStyle::Secondary => cx.theme().secondary_active, ButtonStyle::Secondary | ButtonStyle::Outline | ButtonStyle::Ghost => {
cx.theme().secondary_active
}
ButtonStyle::Danger => cx.theme().destructive_active, ButtonStyle::Danger => cx.theme().destructive_active,
ButtonStyle::Outline => cx.theme().secondary_active,
ButtonStyle::Ghost => cx.theme().secondary_active,
ButtonStyle::Link => cx.theme().transparent, ButtonStyle::Link => cx.theme().transparent,
ButtonStyle::Custom(colors) => colors.active, ButtonStyle::Custom(colors) => colors.active,
}; };
@ -488,10 +484,10 @@ impl ButtonStyle {
fn selected(&self, cx: &WindowContext) -> ButtonStyles { fn selected(&self, cx: &WindowContext) -> ButtonStyles {
let bg = match self { let bg = match self {
ButtonStyle::Primary => cx.theme().primary_active, ButtonStyle::Primary => cx.theme().primary_active,
ButtonStyle::Secondary => cx.theme().secondary_active, ButtonStyle::Secondary | ButtonStyle::Outline | ButtonStyle::Ghost => {
cx.theme().secondary_active
}
ButtonStyle::Danger => cx.theme().destructive_active, ButtonStyle::Danger => cx.theme().destructive_active,
ButtonStyle::Outline => cx.theme().secondary_active,
ButtonStyle::Ghost => cx.theme().secondary_active,
ButtonStyle::Link => cx.theme().transparent, ButtonStyle::Link => cx.theme().transparent,
ButtonStyle::Custom(colors) => colors.active, ButtonStyle::Custom(colors) => colors.active,
}; };
@ -512,11 +508,11 @@ impl ButtonStyle {
fn disabled(&self, cx: &WindowContext) -> ButtonStyles { fn disabled(&self, cx: &WindowContext) -> ButtonStyles {
let bg = match self { let bg = match self {
ButtonStyle::Link => cx.theme().transparent, ButtonStyle::Link | ButtonStyle::Ghost => cx.theme().transparent,
_ => cx.theme().secondary.darken(0.2).grayscale(), _ => cx.theme().secondary.darken(0.2).grayscale(),
}; };
let fg = match self { let fg = match self {
ButtonStyle::Link => cx.theme().link.grayscale(), ButtonStyle::Link | ButtonStyle::Ghost => cx.theme().link.grayscale(),
_ => cx.theme().secondary_foreground.darken(0.2).grayscale(), _ => cx.theme().secondary_foreground.darken(0.2).grayscale(),
}; };