From 2bb261859206fbb5b1f5c3952723e79629af45e4 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 26 Nov 2020 22:26:25 +0800
Subject: [PATCH] synchronize RepeatButton & ToggleButton

---
 .../Themes/Styles/Base/CheckBoxBaseStyle.xaml       |  2 +-
 .../HandyControl_Shared/Themes/Styles/Button.xaml   | 13 +++++--------
 .../Themes/Styles/RepeatButton.xaml                 |  9 ++++++++-
 .../Themes/Styles/ToggleButton.xaml                 |  4 +++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml
index d4116f39..1213ccdb 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml
@@ -49,7 +49,7 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
-                        <Border Height="18" Width="18"  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+                        <Border Height="18" Width="18" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
                         <hc:SimplePanel Grid.Column="0" Height="18" Width="18" x:Name="markGrid" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <Path UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
                             <Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
index ac84338a..91314274 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
@@ -10,23 +10,20 @@
 
     <!--region Button-->
 
-    <Style
-        x:Key="ButtonDefault"
-        BasedOn="{StaticResource ButtonBaseStyle}"
-        TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+                <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
+    <Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button"/>
 
     <Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
index 11bc0b7b..48435c16 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
@@ -10,7 +10,7 @@
 
     <!--region RepeatButton-->
 
-    <Style BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
@@ -22,18 +22,25 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
+    <Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton"/>
+    
     <Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
     </Style>
+    
     <Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
     </Style>
+    
     <Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
     </Style>
+    
     <Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
     </Style>
+    
     <Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
     </Style>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
index 1e73d5c1..a0aff0af 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
@@ -9,7 +9,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--普通-->
-    <Style BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
@@ -23,6 +23,8 @@
         </Style.Triggers>
     </Style>
 
+    <Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton"/>
+
     <Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
     </Style>