From 054b6f59d567921de3933885636b3dbd63bb47a8 Mon Sep 17 00:00:00 2001
From: snail1519 <1147412715@qq.com>
Date: Tue, 18 Mar 2025 10:13:34 +0800
Subject: [PATCH 1/4] fix: Cannot set Background for default SolidButton theme

---
 .../Semi.Avalonia.Demo/Pages/ButtonDemo.axaml |  1 +
 src/Semi.Avalonia/Controls/Button.axaml       | 17 +++++---
 .../Converters/AdaptiveColorConverter.cs      | 40 +++++++++++++++++++
 3 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs

diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
index 2974962..1d9f9bf 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -52,6 +52,7 @@
                 <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
                 <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
                 <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
+                <Button Background="Purple" BorderBrush="Purple" Theme="{DynamicResource SolidButton}">Custom</Button>
                 <Button
                     Classes="Danger"
                     IsEnabled="False"
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index d1059fc..f939169 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:semiConverters="clr-namespace:Semi.Avalonia.Converters"
     x:CompileBindings="True">
     <!--  Button Theme Key: Light, Solid, Outline, Borderless; Default is Light  -->
     <!--  Button Default Classes: Primary, Secondary, Tertiary, Success, Warning, Danger; Default is Primary  -->
@@ -97,6 +98,8 @@
             <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
+    
+    <semiConverters:AdaptiveColorConverter x:Key="AdaptiveColorConverter"/>
 
     <ControlTheme
         x:Key="SolidButton"
@@ -108,20 +111,22 @@
                         Classes="Solid" />
             </FocusAdornerTemplate>
         </Setter>
+        <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
         <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="Background" Value="{TemplateBinding Background}" />
+            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
         </Style>
 
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+            <Setter Property="Background" Value="{TemplateBinding Background, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.2}" />
+            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.2}" />
         </Style>
         <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidPrimaryPressedForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+            <Setter Property="Background" Value="{TemplateBinding Background, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.4}" />
+            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.4}" />
         </Style>
 
         <Style Selector="^.Primary">
diff --git a/src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs b/src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs
new file mode 100644
index 0000000..7c9e633
--- /dev/null
+++ b/src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Globalization;
+using Avalonia;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Styling;
+
+namespace Semi.Avalonia.Converters;
+
+public class AdaptiveColorConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is IImmutableSolidColorBrush brush)
+        {
+            var color = brush.Color;
+            var theme = Application.Current.ActualThemeVariant;
+            var para = double.Parse(parameter?.ToString() ?? "0.2");
+            
+            double factor = theme == ThemeVariant.Light ? -para : para; 
+            return AdjustColorBrightness(color, factor);
+        }
+        return value;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+    
+    private IImmutableSolidColorBrush AdjustColorBrightness(Color color, double factor)
+    {
+        // 调整颜色亮度
+        var r = (byte)Math.Min(255, Math.Max(0, color.R + color.R * factor));
+        var g = (byte)Math.Min(255, Math.Max(0, color.G + color.G * factor));
+        var b = (byte)Math.Min(255, Math.Max(0, color.B + color.B * factor));
+        return new ImmutableSolidColorBrush(Color.FromRgb(r, g, b));
+    }
+}
\ No newline at end of file

From ccdbf25004c674d726b7509d7e646677ba81cc5b Mon Sep 17 00:00:00 2001
From: snail1519 <1147412715@qq.com>
Date: Tue, 18 Mar 2025 11:30:03 +0800
Subject: [PATCH 2/4] Revert "fix: Cannot set Background for default
 SolidButton theme"

This reverts commit 054b6f59d567921de3933885636b3dbd63bb47a8.
---
 .../Semi.Avalonia.Demo/Pages/ButtonDemo.axaml |  1 -
 src/Semi.Avalonia/Controls/Button.axaml       | 17 +++-----
 .../Converters/AdaptiveColorConverter.cs      | 40 -------------------
 3 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs

diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
index 1d9f9bf..2974962 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -52,7 +52,6 @@
                 <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
                 <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
                 <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
-                <Button Background="Purple" BorderBrush="Purple" Theme="{DynamicResource SolidButton}">Custom</Button>
                 <Button
                     Classes="Danger"
                     IsEnabled="False"
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index f939169..d1059fc 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:semiConverters="clr-namespace:Semi.Avalonia.Converters"
     x:CompileBindings="True">
     <!--  Button Theme Key: Light, Solid, Outline, Borderless; Default is Light  -->
     <!--  Button Default Classes: Primary, Secondary, Tertiary, Success, Warning, Danger; Default is Primary  -->
@@ -98,8 +97,6 @@
             <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
-    
-    <semiConverters:AdaptiveColorConverter x:Key="AdaptiveColorConverter"/>
 
     <ControlTheme
         x:Key="SolidButton"
@@ -111,22 +108,20 @@
                         Classes="Solid" />
             </FocusAdornerTemplate>
         </Setter>
-        <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
         <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{TemplateBinding Background}" />
-            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
         </Style>
 
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{TemplateBinding Background, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.2}" />
-            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.2}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidPrimaryPressedForeground}" />
-            <Setter Property="Background" Value="{TemplateBinding Background, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.4}" />
-            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush, Converter={StaticResource AdaptiveColorConverter}, ConverterParameter=0.4}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
 
         <Style Selector="^.Primary">
diff --git a/src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs b/src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs
deleted file mode 100644
index 7c9e633..0000000
--- a/src/Semi.Avalonia/Converters/AdaptiveColorConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia;
-using Avalonia.Data.Converters;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Styling;
-
-namespace Semi.Avalonia.Converters;
-
-public class AdaptiveColorConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        if (value is IImmutableSolidColorBrush brush)
-        {
-            var color = brush.Color;
-            var theme = Application.Current.ActualThemeVariant;
-            var para = double.Parse(parameter?.ToString() ?? "0.2");
-            
-            double factor = theme == ThemeVariant.Light ? -para : para; 
-            return AdjustColorBrightness(color, factor);
-        }
-        return value;
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-    
-    private IImmutableSolidColorBrush AdjustColorBrightness(Color color, double factor)
-    {
-        // 调整颜色亮度
-        var r = (byte)Math.Min(255, Math.Max(0, color.R + color.R * factor));
-        var g = (byte)Math.Min(255, Math.Max(0, color.G + color.G * factor));
-        var b = (byte)Math.Min(255, Math.Max(0, color.B + color.B * factor));
-        return new ImmutableSolidColorBrush(Color.FromRgb(r, g, b));
-    }
-}
\ No newline at end of file

From 9eab777faa1449d8bb4d2f24fa424ac93afa4f56 Mon Sep 17 00:00:00 2001
From: snail1519 <1147412715@qq.com>
Date: Tue, 18 Mar 2025 11:34:40 +0800
Subject: [PATCH 3/4] fix: Cannot set Background for default SolidButton theme

---
 demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml | 1 +
 src/Semi.Avalonia/Controls/Button.axaml        | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
index 2974962..1d9f9bf 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -52,6 +52,7 @@
                 <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
                 <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
                 <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
+                <Button Background="Purple" BorderBrush="Purple" Theme="{DynamicResource SolidButton}">Custom</Button>
                 <Button
                     Classes="Danger"
                     IsEnabled="False"
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index d1059fc..400c5e5 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -108,11 +108,9 @@
                         Classes="Solid" />
             </FocusAdornerTemplate>
         </Setter>
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
-        </Style>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+        <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
 
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />

From a6711ab45334768529c891278255b4482cede91d Mon Sep 17 00:00:00 2001
From: snail1519 <58659256+snail1519@users.noreply.github.com>
Date: Tue, 18 Mar 2025 17:22:46 +0800
Subject: [PATCH 4/4] Update demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml

Co-authored-by: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
---
 demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
index 1d9f9bf..2974962 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -52,7 +52,6 @@
                 <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
                 <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
                 <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
-                <Button Background="Purple" BorderBrush="Purple" Theme="{DynamicResource SolidButton}">Custom</Button>
                 <Button
                     Classes="Danger"
                     IsEnabled="False"