Adjust TintColor
color token terminology (#22826)
Previously, to use a green and red shade with `TintColor` you'd need to pass `Positive` and `Negative`, respectively. This terminology always tripped me up, because, for example, I'd often try to use something like: ``` Button::new("icon_color", "Negative") style(ButtonStyle::Tinted(TintColor::Negative)) .color(Color::Error) .icon_color(Color::Error) .icon(IconName::Trash), ) ``` ...and due to `icon_color` taking `Color::Error`, I'd always get `TintColor` wrong at a first try, because I would, out of muscle memory, write `TintColor::Error`, which wouldn't compile. That's exactly the change in this PR—`TintColor` now takes `Success` and `Error` instead of `Positive` and `Negative`, for more consistency. Release Notes: - N/A
This commit is contained in:
parent
bbb473b8df
commit
115aa43354
4 changed files with 18 additions and 18 deletions
|
@ -49,9 +49,9 @@ pub enum IconPosition {
|
|||
pub enum TintColor {
|
||||
#[default]
|
||||
Accent,
|
||||
Negative,
|
||||
Error,
|
||||
Warning,
|
||||
Positive,
|
||||
Success,
|
||||
}
|
||||
|
||||
impl TintColor {
|
||||
|
@ -63,7 +63,7 @@ impl TintColor {
|
|||
label_color: cx.theme().colors().text,
|
||||
icon_color: cx.theme().colors().text,
|
||||
},
|
||||
TintColor::Negative => ButtonLikeStyles {
|
||||
TintColor::Error => ButtonLikeStyles {
|
||||
background: cx.theme().status().error_background,
|
||||
border_color: cx.theme().status().error_border,
|
||||
label_color: cx.theme().colors().text,
|
||||
|
@ -75,7 +75,7 @@ impl TintColor {
|
|||
label_color: cx.theme().colors().text,
|
||||
icon_color: cx.theme().colors().text,
|
||||
},
|
||||
TintColor::Positive => ButtonLikeStyles {
|
||||
TintColor::Success => ButtonLikeStyles {
|
||||
background: cx.theme().status().success_background,
|
||||
border_color: cx.theme().status().success_border,
|
||||
label_color: cx.theme().colors().text,
|
||||
|
@ -89,9 +89,9 @@ impl From<TintColor> for Color {
|
|||
fn from(tint: TintColor) -> Self {
|
||||
match tint {
|
||||
TintColor::Accent => Color::Accent,
|
||||
TintColor::Negative => Color::Error,
|
||||
TintColor::Error => Color::Error,
|
||||
TintColor::Warning => Color::Warning,
|
||||
TintColor::Positive => Color::Success,
|
||||
TintColor::Success => Color::Success,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue