From 115aa433545be1a361b943c5eef53e27fc27870e Mon Sep 17 00:00:00 2001 From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:40:48 -0300 Subject: [PATCH] Adjust `TintColor` color token terminology (#22826) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- crates/assistant/src/assistant_panel.rs | 4 ++-- crates/title_bar/src/collab.rs | 4 ++-- crates/ui/src/components/button/button.rs | 16 ++++++++-------- crates/ui/src/components/button/button_like.rs | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index 0eaa0f5ca8..712aaa845a 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -3654,7 +3654,7 @@ impl ContextEditor { let (style, tooltip) = match token_state(&self.context, cx) { Some(TokenState::NoTokensLeft { .. }) => ( - ButtonStyle::Tinted(TintColor::Negative), + ButtonStyle::Tinted(TintColor::Error), Some(Tooltip::text("Token limit reached", cx)), ), Some(TokenState::HasMoreTokens { @@ -3711,7 +3711,7 @@ impl ContextEditor { let (style, tooltip) = match token_state(&self.context, cx) { Some(TokenState::NoTokensLeft { .. }) => ( - ButtonStyle::Tinted(TintColor::Negative), + ButtonStyle::Tinted(TintColor::Error), Some(Tooltip::text("Token limit reached", cx)), ), Some(TokenState::HasMoreTokens { diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs index 5ef724ef7a..8639e48c5e 100644 --- a/crates/title_bar/src/collab.rs +++ b/crates/title_bar/src/collab.rs @@ -381,7 +381,7 @@ impl TitleBar { .style(ButtonStyle::Subtle) .icon_size(IconSize::Small) .toggle_state(is_muted) - .selected_style(ButtonStyle::Tinted(TintColor::Negative)) + .selected_style(ButtonStyle::Tinted(TintColor::Error)) .on_click(move |_, cx| { toggle_mute(&Default::default(), cx); }) @@ -398,7 +398,7 @@ impl TitleBar { }, ) .style(ButtonStyle::Subtle) - .selected_style(ButtonStyle::Tinted(TintColor::Negative)) + .selected_style(ButtonStyle::Tinted(TintColor::Error)) .icon_size(IconSize::Small) .toggle_state(is_deafened) .tooltip(move |cx| { diff --git a/crates/ui/src/components/button/button.rs b/crates/ui/src/components/button/button.rs index 4a2975bab7..45f185a550 100644 --- a/crates/ui/src/components/button/button.rs +++ b/crates/ui/src/components/button/button.rs @@ -474,9 +474,9 @@ impl ComponentPreview for Button { .style(ButtonStyle::Tinted(TintColor::Accent)), ), single_example( - "Negative", - Button::new("tinted_negative", "Negative") - .style(ButtonStyle::Tinted(TintColor::Negative)), + "Error", + Button::new("tinted_negative", "Error") + .style(ButtonStyle::Tinted(TintColor::Error)), ), single_example( "Warning", @@ -484,9 +484,9 @@ impl ComponentPreview for Button { .style(ButtonStyle::Tinted(TintColor::Warning)), ), single_example( - "Positive", - Button::new("tinted_positive", "Positive") - .style(ButtonStyle::Tinted(TintColor::Positive)), + "Success", + Button::new("tinted_positive", "Success") + .style(ButtonStyle::Tinted(TintColor::Success)), ), ], ), @@ -527,8 +527,8 @@ impl ComponentPreview for Button { ), single_example( "Tinted Icons", - Button::new("icon_color", "Delete") - .style(ButtonStyle::Tinted(TintColor::Negative)) + Button::new("icon_color", "Error") + .style(ButtonStyle::Tinted(TintColor::Error)) .color(Color::Error) .icon_color(Color::Error) .icon(IconName::Trash) diff --git a/crates/ui/src/components/button/button_like.rs b/crates/ui/src/components/button/button_like.rs index e2d83486cd..26ef2fc19f 100644 --- a/crates/ui/src/components/button/button_like.rs +++ b/crates/ui/src/components/button/button_like.rs @@ -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 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, } } }