From 38130916681f3f253518cdb1351c335011a3a22f Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:26:02 +0800
Subject: [PATCH] fix: fix SolidButton colors.

---
 .../Semi.Avalonia.Demo/Pages/ButtonDemo.axaml |  6 ++---
 demo/Semi.Avalonia.Demo/Pages/Overview.axaml  | 12 ++++++++++
 .../Pages/RepeatButtonDemo.axaml              |  6 ++---
 src/Semi.Avalonia/Controls/Button.axaml       | 18 +++++++-------
 src/Semi.Avalonia/Controls/RepeatButton.axaml | 24 +++++++++----------
 5 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
index 0ae513a..f34ed80 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -15,7 +15,7 @@
                 <Button Classes="Success">Success</Button>
                 <Button Classes="Warning">Warning</Button>
                 <Button Classes="Danger">Danger</Button>
-                <Button Classes="Primary" IsEnabled="False">Danger</Button>
+                <Button Classes="Danger" IsEnabled="False">Danger</Button>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Spacing="20">
                 <Button Classes="Primary Small">Small</Button>
@@ -31,7 +31,7 @@
                 <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
                 <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
                 <Button
-                    Classes="Primary"
+                    Classes="Danger"
                     IsEnabled="False"
                     Theme="{DynamicResource SolidButton}">
                     Danger
@@ -46,7 +46,7 @@
                 <Button Classes="Warning" Theme="{DynamicResource BorderlessButton}">Warning</Button>
                 <Button Classes="Danger" Theme="{DynamicResource BorderlessButton}">Danger</Button>
                 <Button
-                    Classes="Primary"
+                    Classes="Danger"
                     IsEnabled="False"
                     Theme="{DynamicResource BorderlessButton}">
                     Danger
diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
index 05710e0..e4a3608 100644
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
@@ -87,31 +87,37 @@
                                 Margin="0,8"
                                 Classes="Primary"
                                 Content="Primary"
+                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Secondary"
                                 Content="Secondary"
+                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Tertiary"
                                 Content="Tertiary"
+                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Success"
                                 Content="Success"
+                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Warning"
                                 Content="Warning"
+                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Danger"
                                 Content="Danger"
+                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                         </StackPanel>
                         <Calendar Margin="16,0" />
@@ -194,26 +200,32 @@
                         <StackPanel Margin="16,0">
                             <Button
                                 Margin="0,8"
+                                HorizontalAlignment="Stretch"
                                 Classes="Primary"
                                 Content="Primary" />
                             <Button
                                 Margin="0,8"
+                                HorizontalAlignment="Stretch"
                                 Classes="Secondary"
                                 Content="Secondary" />
                             <Button
                                 Margin="0,8"
+                                HorizontalAlignment="Stretch"
                                 Classes="Tertiary"
                                 Content="Tertiary" />
                             <Button
                                 Margin="0,8"
+                                HorizontalAlignment="Stretch"
                                 Classes="Success"
                                 Content="Success" />
                             <Button
                                 Margin="0,8"
+                                HorizontalAlignment="Stretch"
                                 Classes="Warning"
                                 Content="Warning" />
                             <Button
                                 Margin="0,8"
+                                HorizontalAlignment="Stretch"
                                 Classes="Danger"
                                 Content="Danger" />
                         </StackPanel>
diff --git a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
index 65fe844..aaddaa6 100644
--- a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
@@ -16,7 +16,7 @@
             <RepeatButton Classes="Success">Success</RepeatButton>
             <RepeatButton Classes="Warning">Warning</RepeatButton>
             <RepeatButton Classes="Danger">Danger</RepeatButton>
-            <RepeatButton Classes="Primary" IsEnabled="False">Danger</RepeatButton>
+            <RepeatButton Classes="Danger" IsEnabled="False">Danger</RepeatButton>
         </StackPanel>
         <TextBlock>Solid</TextBlock>
         <StackPanel Orientation="Horizontal" Spacing="20">
@@ -27,7 +27,7 @@
             <RepeatButton Classes="Warning" Theme="{DynamicResource SolidRepeatButton}">Warning</RepeatButton>
             <RepeatButton Classes="Danger" Theme="{DynamicResource SolidRepeatButton}">Danger</RepeatButton>
             <RepeatButton
-                Classes="Primary"
+                Classes="Danger"
                 IsEnabled="False"
                 Theme="{DynamicResource SolidRepeatButton}">
                 Danger
@@ -42,7 +42,7 @@
             <RepeatButton Classes="Warning" Theme="{DynamicResource BorderlessRepeatButton}">Warning</RepeatButton>
             <RepeatButton Classes="Danger" Theme="{DynamicResource BorderlessRepeatButton}">Danger</RepeatButton>
             <RepeatButton
-                Classes="Primary"
+                Classes="Danger"
                 IsEnabled="False"
                 Theme="{DynamicResource BorderlessRepeatButton}">
                 Danger
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index 0a89ec6..1064917 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -151,11 +151,11 @@
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             </Style>
-            <Style Selector="^:pointerover">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
@@ -166,11 +166,11 @@
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             </Style>
-            <Style Selector="^:pointerover">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
@@ -181,11 +181,11 @@
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             </Style>
-            <Style Selector="^:pointerover">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
@@ -196,17 +196,17 @@
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             </Style>
-            <Style Selector="^:pointerover">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
-        <Style Selector="^:disabled">
+        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
diff --git a/src/Semi.Avalonia/Controls/RepeatButton.axaml b/src/Semi.Avalonia/Controls/RepeatButton.axaml
index 69b5fbe..8882653 100644
--- a/src/Semi.Avalonia/Controls/RepeatButton.axaml
+++ b/src/Semi.Avalonia/Controls/RepeatButton.axaml
@@ -151,11 +151,11 @@
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             </Style>
-            <Style Selector="^:pointerover">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
@@ -163,14 +163,14 @@
         <Style Selector="^.Warning">
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             </Style>
-            <Style Selector="^:pointerover">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
@@ -178,20 +178,20 @@
         <Style Selector="^.Danger">
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             </Style>
-            <Style Selector="^:pointerover">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
-        <Style Selector="^:disabled">
+        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
@@ -204,7 +204,7 @@
         TargetType="RepeatButton">
         <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="RepeatButton.Background" Value="Transparent" />
-                    <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
+            <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
         </Style>
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="BorderBrush" Value="Transparent" />