From 6d62e6c562412a9bc38856d72892cd5ff9a5682e Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 30 Nov 2023 20:36:59 -0500
Subject: [PATCH] Respect `label_color` for `Button`s (#3469)

This PR makes `Button`s respect the `label_color` that is specified,
provided they are not disabled or selected.

Release Notes:

- N/A
---
 crates/ui2/src/components/button/button.rs  | 2 +-
 crates/ui2/src/components/stories/button.rs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/ui2/src/components/button/button.rs b/crates/ui2/src/components/button/button.rs
index 4bfa71d092883f38fc915bc13c7479bdc2bb864a..ce26ee76a5df38c29e17c024bb839d0229b332d4 100644
--- a/crates/ui2/src/components/button/button.rs
+++ b/crates/ui2/src/components/button/button.rs
@@ -79,7 +79,7 @@ impl RenderOnce for Button {
         } else if self.base.selected {
             Color::Selected
         } else {
-            Color::Default
+            self.label_color.unwrap_or_default()
         };
 
         self.base.child(
diff --git a/crates/ui2/src/components/stories/button.rs b/crates/ui2/src/components/stories/button.rs
index db8aa40cf79d0d1fe0b063b995574f7f287c817c..17bcd8b26850333db4dabfbae2fc0e3570f1e7cc 100644
--- a/crates/ui2/src/components/stories/button.rs
+++ b/crates/ui2/src/components/stories/button.rs
@@ -14,6 +14,10 @@ impl Render for ButtonStory {
             .child(Story::title_for::<Button>())
             .child(Story::label("Default"))
             .child(Button::new("default_filled", "Click me"))
+            .child(Story::label("Selected"))
+            .child(Button::new("selected_filled", "Click me").selected(true))
+            .child(Story::label("With `label_color`"))
+            .child(Button::new("filled_with_label_color", "Click me").color(Color::Created))
             .child(Story::label("Default (Subtle)"))
             .child(Button::new("default_subtle", "Click me").style(ButtonStyle::Subtle))
             .child(Story::label("Default (Transparent)"))