From 671ed74b44b634a2e07dfb8de96417055835be42 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Mon, 23 Jan 2023 00:02:25 +0800
Subject: [PATCH] feat: update resource.

---
 .../Pages/ButtonSpinnerDemo.axaml             |  4 +++
 .../Controls/ButtonSpinner.axaml              | 31 ++++++++++++-------
 .../Themes/Light/ButtonSpinner.axaml          | 12 +++++++
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
index baddc16..a7c375f 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
@@ -14,22 +14,26 @@
         <ButtonSpinner
             Height="30"
             AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+            BorderThickness="1"
             ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}"
             Spin="OnSpin">
             <TextBlock
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
+                Background="Gray"
                 Text="Everest" />
         </ButtonSpinner>
         <ButtonSpinner
             Height="30"
             AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+            BorderThickness="1"
             ButtonSpinnerLocation="Left"
             ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}"
             Spin="OnSpin">
             <TextBlock
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
+                Background="Gray"
                 Text="Everest" />
         </ButtonSpinner>
     </StackPanel>
diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
index 062e04d..63c9eb5 100644
--- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
@@ -5,6 +5,8 @@
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="ButtonSpinnerRepeatButton" TargetType="RepeatButton">
+        <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSpinnerRepeatButtonBackground}" />
+        <Setter Property="RepeatButton.Cursor" Value="Hand" />
         <Setter Property="RepeatButton.Template">
             <ControlTemplate>
                 <ContentPresenter
@@ -20,22 +22,21 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSpinnerRepeatButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSpinnerRepeatButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
-            <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSpinnerRepeatButtonDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSpinnerRepeatButtonDisabledForeground}" />
         </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
-        <Setter Property="ButtonSpinner.BorderBrush" Value="LightGray" />
-        <Setter Property="ButtonSpinner.CornerRadius" Value="3" />
+        <Setter Property="ButtonSpinner.BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}" />
         <Setter Property="ButtonSpinner.BorderThickness" Value="0" />
         <Setter Property="ButtonSpinner.MinWidth" Value="300" />
         <!--  Add Resource  -->
@@ -46,7 +47,8 @@
                         Grid.Column="1"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        UseLayoutRounding="False">
                         <ContentPresenter
                             Name="PART_ContentPresenter"
                             Padding="{TemplateBinding Padding}"
@@ -56,17 +58,19 @@
                             ContentTemplate="{TemplateBinding ContentTemplate}" />
                     </Border>
                     <Border
+                        Name="ButtonGroup"
                         Grid.Column="2"
                         MinWidth="16"
                         Margin="4,0,0,0"
-                        BorderBrush="LightGray"
-                        BorderThickness="1"
-                        CornerRadius="3">
+                        BorderBrush="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}"
+                        BorderThickness="{DynamicResource ButtonSpinnerButtonGroupBorderThickness}"
+                        CornerRadius="{DynamicResource ButtonSpinnerButtonGroupCornerRadius}"
+                        IsVisible="{TemplateBinding ShowButtonSpinner}"
+                        UseLayoutRounding="False">
                         <Grid RowDefinitions="*, *">
                             <RepeatButton
                                 Name="PART_IncreaseButton"
                                 Grid.Row="0"
-                                Padding="0"
                                 Theme="{StaticResource ButtonSpinnerRepeatButton}">
                                 <PathIcon
                                     Width="8"
@@ -77,7 +81,6 @@
                             <RepeatButton
                                 Name="PART_DecreaseButton"
                                 Grid.Row="1"
-                                Padding="0"
                                 Foreground="Black"
                                 Theme="{StaticResource ButtonSpinnerRepeatButton}">
                                 <PathIcon
@@ -91,5 +94,9 @@
                 </Grid>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^[ButtonSpinnerLocation=Left] /template/ Border#ButtonGroup">
+            <Setter Property="Grid.Column" Value="0" />
+            <Setter Property="Border.Margin" Value="0 0 4 0" />
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
index 0d5f5a9..19f8ee2 100644
--- a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
@@ -2,4 +2,16 @@
     <!--  Add Resources Here  -->
     <PathGeometry x:Key="ButtonSpinnerIncreaseButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
     <PathGeometry x:Key="ButtonSpinnerDecreaseButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="White" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" Opacity="0.13" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBorderBrush" Opacity="0.13" Color="#2E3238" />
+
+    <CornerRadius x:Key="ButtonSpinnerButtonGroupCornerRadius">3</CornerRadius>
+    <Thickness x:Key="ButtonSpinnerButtonGroupBorderThickness">1</Thickness>
+
 </ResourceDictionary>