From 387644417656d7fbabef650383f2f003787899c1 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 9 Oct 2022 22:52:28 +0800
Subject: [PATCH] chore(style): add Label small style.

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 28 ++++++++++++++-
 .../UserControl/Styles/LabelDemoCtl.xaml      | 26 +++++++++-----
 .../Themes/Styles/Base/LabelBaseStyle.xaml    |  1 +
 .../Themes/Styles/Label.xaml                  | 36 +++++++++++++++++--
 .../HandyControl_Shared/Themes/Theme.xaml     | 28 ++++++++++++++-
 5 files changed, 107 insertions(+), 12 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 46d965bd..2afdc820 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -1384,6 +1384,7 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="HorizontalAlignment" Value="Center" />
 		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Label">
@@ -3420,25 +3421,50 @@
 	</Style>
 	<Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
 	<Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
-	<Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+	<Style x:Key="LabelDefault" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 	</Style>
+	<Style BasedOn="{StaticResource LabelDefault}" TargetType="Label" />
+	<Style x:Key="LabelDefault.Small" BasedOn="{StaticResource LabelDefault}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
 	<Style x:Key="LabelPrimary" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
 	</Style>
+	<Style x:Key="LabelPrimary.Small" BasedOn="{StaticResource LabelPrimary}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
 	<Style x:Key="LabelSuccess" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
 	</Style>
+	<Style x:Key="LabelSuccess.Small" BasedOn="{StaticResource LabelSuccess}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
 	<Style x:Key="LabelInfo" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
 	</Style>
+	<Style x:Key="LabelInfo.Small" BasedOn="{StaticResource LabelInfo}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
 	<Style x:Key="LabelWarning" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
 	</Style>
+	<Style x:Key="LabelWarning.Small" BasedOn="{StaticResource LabelWarning}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
 	<Style x:Key="LabelDanger" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
 	</Style>
+	<Style x:Key="LabelDanger.Small" BasedOn="{StaticResource LabelDanger}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
 	<Style BasedOn="{StaticResource CompareSliderBaseStyle}" TargetType="hc:CompareSlider" />
 	<Style BasedOn="{StaticResource PreviewSliderBaseStyle}" TargetType="hc:PreviewSlider" />
 	<Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml
index 626212b2..a9f6749a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml
@@ -6,13 +6,23 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32">
-            <Label HorizontalAlignment="Left" Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
-            <Label HorizontalAlignment="Left" Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDanger}"/>
-            <Label HorizontalAlignment="Left" Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelInfo}"/>
-            <Label HorizontalAlignment="Left" Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelPrimary}"/>
-            <Label HorizontalAlignment="Left" Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelSuccess}"/>
-            <Label HorizontalAlignment="Left" Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelWarning}"/>
-        </StackPanel>
+        <hc:UniformSpacingPanel Margin="32" Spacing="32" ChildWrapping="Wrap">
+            <hc:UniformSpacingPanel Spacing="5" Orientation="Vertical">
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDanger}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelInfo}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelPrimary}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelSuccess}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelWarning}" />
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="5" Orientation="Vertical">
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDefault.Small}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDanger.Small}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelInfo.Small}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelPrimary.Small}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelSuccess.Small}" />
+                <Label Content="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelWarning.Small}" />
+            </hc:UniformSpacingPanel>
+        </hc:UniformSpacingPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/LabelBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/LabelBaseStyle.xaml
index fc4afd7c..82d9ad3a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/LabelBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/LabelBaseStyle.xaml
@@ -12,6 +12,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Label">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Label.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Label.xaml
index 295c2d40..bea5d3d1 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Label.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Label.xaml
@@ -1,29 +1,61 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+    <Style x:Key="LabelDefault" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
     </Style>
 
+    <Style BasedOn="{StaticResource LabelDefault}" TargetType="Label" />
+
+    <Style x:Key="LabelDefault.Small" BasedOn="{StaticResource LabelDefault}" TargetType="Label">
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Padding" Value="6,0" />
+    </Style>
+
     <Style x:Key="LabelPrimary" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
     </Style>
 
+    <Style x:Key="LabelPrimary.Small" BasedOn="{StaticResource LabelPrimary}" TargetType="Label">
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Padding" Value="6,0" />
+    </Style>
+
     <Style x:Key="LabelSuccess" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
         <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
     </Style>
 
+    <Style x:Key="LabelSuccess.Small" BasedOn="{StaticResource LabelSuccess}" TargetType="Label">
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Padding" Value="6,0" />
+    </Style>
+
     <Style x:Key="LabelInfo" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
         <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
     </Style>
 
+    <Style x:Key="LabelInfo.Small" BasedOn="{StaticResource LabelInfo}" TargetType="Label">
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Padding" Value="6,0" />
+    </Style>
+
     <Style x:Key="LabelWarning" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
         <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
     </Style>
 
+    <Style x:Key="LabelWarning.Small" BasedOn="{StaticResource LabelWarning}" TargetType="Label">
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Padding" Value="6,0" />
+    </Style>
+
     <Style x:Key="LabelDanger" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-        <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+    </Style>
+
+    <Style x:Key="LabelDanger.Small" BasedOn="{StaticResource LabelDanger}" TargetType="Label">
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Padding" Value="6,0" />
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 4c391eeb..5107cc00 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1384,6 +1384,7 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="HorizontalAlignment" Value="Center" />
 		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Label">
@@ -3420,25 +3421,50 @@
 	</Style>
 	<Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
 	<Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
-	<Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+	<Style x:Key="LabelDefault" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 	</Style>
+	<Style BasedOn="{StaticResource LabelDefault}" TargetType="Label" />
+	<Style x:Key="LabelDefault.Small" BasedOn="{StaticResource LabelDefault}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="LabelPrimary" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
 	</Style>
+	<Style x:Key="LabelPrimary.Small" BasedOn="{StaticResource LabelPrimary}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="LabelSuccess" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
 	</Style>
+	<Style x:Key="LabelSuccess.Small" BasedOn="{StaticResource LabelSuccess}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="LabelInfo" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
 	</Style>
+	<Style x:Key="LabelInfo.Small" BasedOn="{StaticResource LabelInfo}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="LabelWarning" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
 	</Style>
+	<Style x:Key="LabelWarning.Small" BasedOn="{StaticResource LabelWarning}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="LabelDanger" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
 	</Style>
+	<Style x:Key="LabelDanger.Small" BasedOn="{StaticResource LabelDanger}" TargetType="Label">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource CompareSliderBaseStyle}" TargetType="hc:CompareSlider" />
 	<Style BasedOn="{StaticResource PreviewSliderBaseStyle}" TargetType="hc:PreviewSlider" />
 	<Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">