From 89107fd36450646affa7c5a546802143d7eacbd8 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Fri, 12 Mar 2021 18:34:08 +0330
Subject: [PATCH 01/56] Fix Missing Dropper ToggleButton

---
 .../Themes/Styles/Base/ColorPickerBaseStyle.xaml            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ColorPickerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ColorPickerBaseStyle.xaml
index a28564d8..8c35afe8 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ColorPickerBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ColorPickerBaseStyle.xaml
@@ -192,9 +192,9 @@
                                 <ColumnDefinition Width="28"/>
                             </Grid.ColumnDefinitions>
                             <ToggleButton Name="PART_ButtonDropper" Width="16" Height="16" Margin="0,0,10,0" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
-                                <Path Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                                <Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
                                 <hc:StatusSwitchElement.CheckedElement>
-                                    <Path Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}"/>
+                                    <Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}"/>
                                 </hc:StatusSwitchElement.CheckedElement>
                             </ToggleButton>
                             <Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"/>
@@ -244,4 +244,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From a8e78832b78f8fbe05b9ed23e23cb8841dfdfcf5 Mon Sep 17 00:00:00 2001
From: "github-actions-dotnet-formatter[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 14 Mar 2021 12:08:47 +0000
Subject: [PATCH 02/56] Automated dotnet-format update

---
 src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
index 6bbc4dbb..5c4c6f8b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
@@ -243,7 +243,7 @@ namespace HandyControl.Controls
         {
             if (d is Pagination pagination)
             {
-                pagination.OnAutoHidingChanged((bool)e.NewValue);
+                pagination.OnAutoHidingChanged((bool) e.NewValue);
             }
         }
 

From bbf91c75e59c3c98ec698d0a0e3060f6c94ebcce Mon Sep 17 00:00:00 2001
From: GF-Huang <GF-Huang@users.noreply.github.com>
Date: Mon, 15 Mar 2021 04:37:04 +0800
Subject: [PATCH 03/56] Make DataGridCell BorderRadius and
 DataGridColumnHeader.Background configable.

---
 src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
index 022bacd2..ce01c750 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
@@ -47,10 +47,11 @@
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
         <Setter Property="Margin" Value="0,0,4,0"/>
+        <Setter Property="hc:BorderElement.CornerRadius" Value="4" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridCell">
-                    <Border CornerRadius="4" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource Mode=TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                         <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                     </Border>
                 </ControlTemplate>
@@ -167,13 +168,14 @@
     <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="12,6,12,12"/>
         <Setter Property="MinHeight" Value="44"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridColumnHeader">
                     <hc:SimplePanel>
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
                             <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition/>

From c3a5ec7bab328b444168dc60c09d66c47d7b71ca Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 15 Mar 2021 22:43:50 +0800
Subject: [PATCH 04/56] IsDirectionReversed was incorporated into position
 calculation

---
 .../Controls/Slider/PreviewSlider.cs          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
index d0e1d042..a28257eb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
@@ -89,12 +89,18 @@ namespace HandyControl.Controls
             base.OnMouseMove(e);
 
             if (_previewContent == null) return;
+
             var p = e.GetPosition(_adorner);
+            var maximum = Maximum;
+            var minimum = Minimum;
 
             if (Orientation == Orientation.Horizontal)
             {
-                var pos = (e.GetPosition(this).X - _thumb.ActualWidth / 2) / _track.ActualWidth * Maximum;
-                if (pos > Maximum || pos < 0)
+
+                var pos = !IsDirectionReversed
+                    ? (e.GetPosition(this).X - _thumb.ActualWidth * 0.5) / _track.ActualWidth * (maximum - minimum) + minimum
+                    : (1 - (e.GetPosition(this).X - _thumb.ActualWidth * 0.5) / _track.ActualWidth) * (maximum - minimum) + minimum;
+                if (pos > maximum || pos < 0)
                 {
                     if (_thumb.IsMouseCaptureWithin)
                     {
@@ -103,15 +109,17 @@ namespace HandyControl.Controls
                     return;
                 }
 
-                _transform.X = p.X - _previewContent.ActualWidth / 2;
+                _transform.X = p.X - _previewContent.ActualWidth * 0.5;
                 _transform.Y = TranslatePoint(new Point(), _adorner).Y - _previewContent.ActualHeight - PreviewContentOffset;
 
                 PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos;
             }
             else
             {
-                var pos = Maximum - (e.GetPosition(this).Y - _thumb.ActualHeight / 2) / _track.ActualHeight * Maximum;
-                if (pos > Maximum || pos < 0)
+                var pos = !IsDirectionReversed
+                    ? (1 - (e.GetPosition(this).Y - _thumb.ActualHeight * 0.5) / _track.ActualHeight) * (maximum - minimum) + minimum
+                    : (e.GetPosition(this).Y - _thumb.ActualHeight * 0.5) / _track.ActualHeight * (maximum - minimum) + minimum;
+                if (pos > maximum || pos < 0)
                 {
                     if (_thumb.IsMouseCaptureWithin)
                     {
@@ -121,7 +129,7 @@ namespace HandyControl.Controls
                 }
 
                 _transform.X = TranslatePoint(new Point(), _adorner).X - _previewContent.ActualWidth - PreviewContentOffset;
-                _transform.Y = p.Y - _previewContent.ActualHeight / 2;
+                _transform.Y = p.Y - _previewContent.ActualHeight * 0.5;
 
                 PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos;
             }

From 85b64defb72b75d2e3eac79b65d07e32c0bbe274 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 17 Mar 2021 00:08:54 +0800
Subject: [PATCH 05/56] sync with net40

---
 src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml | 3 ++-
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml           | 7 ++++---
 src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml | 7 +++----
 src/Shared/HandyControl_Shared/Themes/Theme.xaml           | 7 ++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
index 659adf27..35ab2f26 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -47,10 +47,11 @@
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
         <Setter Property="Margin" Value="0,0,4,0"/>
+        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridCell">
-                    <Border CornerRadius="4" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                         <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                     </Border>
                 </ControlTemplate>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index d89909b1..d6ef98c3 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -7362,9 +7362,9 @@
 								<ColumnDefinition Width="28" />
 							</Grid.ColumnDefinitions>
 							<ToggleButton Name="PART_ButtonDropper" Width="16" Height="16" Margin="0,0,10,0" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
-								<Path Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
+								<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
 								<hc:StatusSwitchElement.CheckedElement>
-									<Path Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
+									<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
 								</hc:StatusSwitchElement.CheckedElement>
 							</ToggleButton>
 							<Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
@@ -11446,10 +11446,11 @@
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
 		<Setter Property="Margin" Value="0,0,4,0" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="DataGridCell">
-					<Border CornerRadius="4" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
 						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 				</ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
index ce01c750..51b65ed6 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
@@ -47,11 +47,11 @@
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
         <Setter Property="Margin" Value="0,0,4,0"/>
-        <Setter Property="hc:BorderElement.CornerRadius" Value="4" />
+        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridCell">
-                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource Mode=TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                         <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                     </Border>
                 </ControlTemplate>
@@ -168,14 +168,13 @@
     <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="12,6,12,12"/>
         <Setter Property="MinHeight" Value="44"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridColumnHeader">
                     <hc:SimplePanel>
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
                             <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 444ddb2a..ca760c7d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -7480,9 +7480,9 @@
 								<ColumnDefinition Width="28" />
 							</Grid.ColumnDefinitions>
 							<ToggleButton Name="PART_ButtonDropper" Width="16" Height="16" Margin="0,0,10,0" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
-								<Path Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
+								<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
 								<hc:StatusSwitchElement.CheckedElement>
-									<Path Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
+									<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
 								</hc:StatusSwitchElement.CheckedElement>
 							</ToggleButton>
 							<Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
@@ -11579,10 +11579,11 @@
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
 		<Setter Property="Margin" Value="0,0,4,0" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="DataGridCell">
-					<Border CornerRadius="4" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
 						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 				</ControlTemplate>

From 8dde08bd9ad24e9762527c66f54b96df839f1258 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 17 Mar 2021 22:25:34 +0800
Subject: [PATCH 06/56] fixed #724

---
 src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml | 7 ++++---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml           | 7 ++++---
 src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml | 7 ++++---
 src/Shared/HandyControl_Shared/Themes/Theme.xaml           | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
index 35ab2f26..51e706b8 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -46,13 +46,14 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
-        <Setter Property="Margin" Value="0,0,4,0"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridCell">
-                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    <Border Background="Transparent">
+                        <Border Margin="0,0,4,0"  CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index d6ef98c3..e5383bd3 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -11445,13 +11445,14 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="Margin" Value="0,0,4,0" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="DataGridCell">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					<Border Background="Transparent">
+						<Border Margin="0,0,4,0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
index 51b65ed6..4e430919 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
@@ -46,13 +46,14 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
-        <Setter Property="Margin" Value="0,0,4,0"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridCell">
-                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    <Border Background="Transparent">
+                        <Border Margin="0,0,4,0"  CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index ca760c7d..96d20c2a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -11578,13 +11578,14 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="Margin" Value="0,0,4,0" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="DataGridCell">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					<Border Background="Transparent">
+						<Border Margin="0,0,4,0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>

From 59cc5749f4e16976952dfd07eec4bb2149512600 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 17 Mar 2021 22:43:48 +0800
Subject: [PATCH 07/56] fixed #730

---
 .../HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
index 8e5c2454..3888b91c 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
@@ -143,7 +143,7 @@ namespace HandyControl.Controls
                 _dataView.GroupDescriptions.Clear();
                 _dataView.SortDescriptions.Clear();
                 _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.CategoryProperty.Name, ListSortDirection.Ascending));
-                _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.PropertyNameProperty.Name, ListSortDirection.Ascending));
+                _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.DisplayNameProperty.Name, ListSortDirection.Ascending));
                 _dataView.GroupDescriptions.Add(new PropertyGroupDescription(PropertyItem.CategoryProperty.Name));
             }
         }

From 15caef9026e46ef69d006e0e6299654f5a11bd27 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 22 Mar 2021 17:40:33 +0800
Subject: [PATCH 08/56] Update README.md

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 56e2537c..f5fe3f38 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,10 @@
 
 ## 面向中国
 
+### 招聘
+
+百度地图，招WPF研发工程师，有兴趣私聊 836904362@qq.com
+
 ### 码云
 
 [https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/)
@@ -562,4 +566,4 @@ Step 4: Enjoy coding
 
 ### Brush
 
-![Brush](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Brush.png)
\ No newline at end of file
+![Brush](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Brush.png)

From abe92de8886721b2b2d7eb6f134e4524bbd9c1b0 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 22 Mar 2021 17:41:35 +0800
Subject: [PATCH 09/56] Update README-cn.md

---
 README-cn.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README-cn.md b/README-cn.md
index 33ef3aa2..9d1eefc0 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -28,6 +28,10 @@
 
 ## 面向中国
 
+### 招聘
+
+百度地图，招WPF研发工程师，有兴趣私聊 836904362@qq.com
+
 ### 码云
 
 [https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/)
@@ -562,4 +566,4 @@ Step 4: Enjoy coding
 
 ### Brush
 
-![Brush](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Brush.png)
\ No newline at end of file
+![Brush](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Brush.png)

From 5daf4ab191370dcfe2f0fb984cbb5fa7250c2eca Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 22 Mar 2021 23:49:22 +0800
Subject: [PATCH 10/56] add some bmp images for toolbox

---
 build/tools/VisualStudioToolsManifest.xml         |   5 +++++
 .../HandyControl_Shared.projitems                 |   5 +++++
 .../HandyControl.Controls.AxleCanvas.icon.bmp     | Bin 0 -> 824 bytes
 .../Icons/HandyControl.Controls.Empty.icon.bmp    | Bin 0 -> 824 bytes
 ...andyControl.Controls.SimpleStackPanel.icon.bmp | Bin 0 -> 822 bytes
 .../HandyControl.Controls.TagContainer.icon.bmp   | Bin 0 -> 822 bytes
 ...yControl.Controls.UniformSpacingPanel.icon.bmp | Bin 0 -> 822 bytes
 7 files changed, 10 insertions(+)
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AxleCanvas.icon.bmp
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Empty.icon.bmp
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleStackPanel.icon.bmp
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TagContainer.icon.bmp
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.UniformSpacingPanel.icon.bmp

diff --git a/build/tools/VisualStudioToolsManifest.xml b/build/tools/VisualStudioToolsManifest.xml
index 09561422..217bf875 100644
--- a/build/tools/VisualStudioToolsManifest.xml
+++ b/build/tools/VisualStudioToolsManifest.xml
@@ -3,6 +3,7 @@
     <ToolboxItems UIFramework="WPF" VSCategory="HandyControl" BlendCategory="HandyControl">
       <Item Type="HandyControl.Controls.AnimationPath" />
       <Item Type="HandyControl.Expression.Shapes.Arc" />
+      <Item Type="HandyControl.Controls.AxleCanvas" />
       <Item Type="HandyControl.Controls.Badge" />
       <Item Type="HandyControl.Controls.BlendEffectBox" />
       <Item Type="HandyControl.Controls.ButtonGroup" />
@@ -28,6 +29,7 @@
       <Item Type="HandyControl.Controls.DialogContainer" />
       <Item Type="HandyControl.Controls.Divider" />
       <Item Type="HandyControl.Controls.Drawer" />
+      <Item Type="HandyControl.Controls.Empty" />
       <Item Type="HandyControl.Controls.FlexPanel" />
       <Item Type="HandyControl.Controls.FlipClock" />
       <Item Type="HandyControl.Controls.FloatingBlock" />
@@ -62,17 +64,20 @@
       <Item Type="HandyControl.Controls.Shield" />
       <Item Type="HandyControl.Controls.SideMenu" />
       <Item Type="HandyControl.Controls.SimplePanel" />
+      <Item Type="HandyControl.Controls.SimpleStackPanel" />
       <Item Type="HandyControl.Controls.SimpleText" />
       <Item Type="HandyControl.Controls.SplitButton" />
       <Item Type="HandyControl.Controls.StepBar" />
       <Item Type="HandyControl.Controls.TabControl" />
       <Item Type="HandyControl.Controls.Tag" />
+      <Item Type="HandyControl.Controls.TagContainer" />
       <Item Type="HandyControl.Controls.TextBox" />
       <Item Type="HandyControl.Controls.TimeBar" />
       <Item Type="HandyControl.Controls.TimePicker" />
       <Item Type="HandyControl.Controls.ToggleBlock" />
       <Item Type="HandyControl.Controls.Transfer" />
       <Item Type="HandyControl.Controls.TransitioningContentControl" />
+      <Item Type="HandyControl.Controls.UniformSpacingPanel" />
       <Item Type="HandyControl.Controls.WaterfallPanel" />
       <Item Type="HandyControl.Controls.Watermark" />
       <Item Type="HandyControl.Controls.WaveProgressBar" />
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 190ac5a6..e7b9e052 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -943,6 +943,7 @@
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.AnimationPath.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Expression.Shapes.Arc.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.AxleCanvas.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Badge.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.BlendEffectBox.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.ButtonGroup.icon.bmp" />
@@ -965,6 +966,7 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Dialog.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Divider.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Drawer.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Empty.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.FlexPanel.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.FlipClock.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.GifImage.icon.bmp" />
@@ -996,15 +998,18 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Shield.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SideMenu.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SimplePanel.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SimpleStackPanel.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SimpleText.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SplitButton.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.StepBar.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Tag.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.TagContainer.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.TimeBar.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.TimePicker.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.ToggleBlock.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Transfer.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.TransitioningContentControl.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.UniformSpacingPanel.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.WaterfallPanel.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Watermark.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.WatermarkTextBox.icon.bmp" />
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AxleCanvas.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AxleCanvas.icon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..6174db8381461ac9f7d6511eba47146e1b0107bf
GIT binary patch
literal 824
zcmd5(yAFUb2t?hDqo3dx80YSOwI8G|UF)T1i7{9olLW}+I0&U~94d*{BX@{qk3!nW
zm#9xQBN9kK!dv&rt{PL_LqP1DQ_=)S0q{f9QP8jRl5q$q=1LFsd>|UX>Ct5x_5_cy
nKc9bl&*T4Q#QI)-fq4^?q@MRzYy#dBC0&V_7d~a30A6GR?>Q(l

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Empty.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Empty.icon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..5bb3ad51f61e05537c2ae585a365019eff8423b9
GIT binary patch
literal 824
zcmZ?rwP0od12Z700mK4O%*Y@C7H0y=ALfH#umF(w&+wll^o?}j1OshtZ9v^X5-5Po
zhRHiY%m#8lzW?y~(<d~=KoOug908TV)e}?<)CE_MY&C?9W-`PIxO)7~z;q9?2eF!r
zW<Jm&JkG#sKF~>cOhz-G7{x#>aQ{Nw59AUA@bD+75~6@S^$=Y|k|ZT&pkf9F0BZXq
AGXMYp

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleStackPanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleStackPanel.icon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..499dfbbaf7e274c7104d0e5e401780fe5e613a16
GIT binary patch
literal 822
zcmZ?rHDhJ~12Z700mK4O%*Y@C76%bW_#hZ2@SoxTHxhvp(EwsFQ2EFA9|$6#GGz65
zbU~yr)dNLv0if+bDN4+Tn1I!Mh}Y1}hp2~0A(KF5c+`(5^O1uElZ_mnSc3&qki>)x
GQVswx%>rfs

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TagContainer.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TagContainer.icon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..15f9c54375daa9b1db0226a7847db40729a0ba38
GIT binary patch
literal 822
zcmZ?rHDhJ~12Z700mK4O%*Y@C76%bW_#hZ2@Sov7spuOi0BAT+xs#I<kt9St@iriv
z53vGh7aD+=1{4G`(9B0u3E?8!KFG~Sb}CjjF82c!!~G7?h(CNV)kAbqXg<UcJS4LD
P5EtSnA?ooMh$aO9e8wjl

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.UniformSpacingPanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.UniformSpacingPanel.icon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..731060112757fcb3870a15014756846c5c0ee180
GIT binary patch
literal 822
zcmZ?rHDhJ~12Z700mK4O%*Y@C76%bW_#hZ2@Sov79nd%80Nf=&<xZ#otH^LtPfQ36
UC;y^GuM@%eB`JL10Y#7j0M5?DrvLx|

literal 0
HcmV?d00001


From 0b257f961eaab6ecb68f434b46994210d553c63c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 23 Mar 2021 00:08:13 +0800
Subject: [PATCH 11/56] update build info

---
 build/build.cake   |  48 ++++++++++++++++++++
 build/build.nuspec | 109 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 151 insertions(+), 6 deletions(-)

diff --git a/build/build.cake b/build/build.cake
index bfd31c23..7bd507a7 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -23,6 +23,34 @@ Task("Build")
         OutputDirectory = "lib/net45"
     };
 
+    var settingsNet451 = new DotNetCoreBuildSettings
+    {
+        Configuration = "Release",
+        Framework = "net451",
+        OutputDirectory = "lib/net451"
+    };
+
+    var settingsNet452 = new DotNetCoreBuildSettings
+    {
+        Configuration = "Release",
+        Framework = "net452",
+        OutputDirectory = "lib/net452"
+    };
+
+    var settingsNet46 = new DotNetCoreBuildSettings
+    {
+        Configuration = "Release",
+        Framework = "net46",
+        OutputDirectory = "lib/net46"
+    };
+
+    var settingsNet461 = new DotNetCoreBuildSettings
+    {
+        Configuration = "Release",
+        Framework = "net461",
+        OutputDirectory = "lib/net461"
+    };
+
     var settingsNet462 = new DotNetCoreBuildSettings
     {
         Configuration = "Release",
@@ -37,6 +65,20 @@ Task("Build")
         OutputDirectory = "lib/net47"
     };
 
+    var settingsNet471 = new DotNetCoreBuildSettings
+    {
+        Configuration = "Release",
+        Framework = "net471",
+        OutputDirectory = "lib/net471"
+    };
+
+    var settingsNet472 = new DotNetCoreBuildSettings
+    {
+        Configuration = "Release",
+        Framework = "net472",
+        OutputDirectory = "lib/net472"
+    };
+
     var settingsNet48 = new DotNetCoreBuildSettings
     {
         Configuration = "Release",
@@ -67,8 +109,14 @@ Task("Build")
 
     DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40);
     DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet451);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet452);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet46);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet461);
     DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462);
     DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet471);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet472);
     DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48);
     DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore30);
     DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore31);
diff --git a/build/build.nuspec b/build/build.nuspec
index 37542257..d20ac159 100644
--- a/build/build.nuspec
+++ b/build/build.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>HandyControl</id>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
     <title>HandyOrg</title>
     <authors>HandyOrg</authors>
     <owners>HandyOrg</owners>
@@ -12,16 +12,20 @@
     <projectUrl>https://github.com/NaBian/HandyControl</projectUrl>
     <description>Contains some commonly used simple WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2020</copyright>
+    <copyright>Copyright © HandyOrg 2018-2021</copyright>
     <tags>WPF C# Control</tags>
     <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="35bbccd5b86bcedcfe16886857343e719feaf173" />
     <dependencies>
-      <group targetFramework=".NETFramework4.0">
-        <dependency id="Microsoft.Windows.Shell" version="3.0.1" />
-      </group>
+      <group targetFramework=".NETFramework4.0" />
       <group targetFramework=".NETFramework4.5" />
+      <group targetFramework=".NETFramework4.5.1" />
+      <group targetFramework=".NETFramework4.5.2" />
+      <group targetFramework=".NETFramework4.6" />
+      <group targetFramework=".NETFramework4.6.1" />
       <group targetFramework=".NETFramework4.6.2" />
       <group targetFramework=".NETFramework4.7" />
+      <group targetFramework=".NETFramework4.7.1" />
+      <group targetFramework=".NETFramework4.7.2" />
       <group targetFramework=".NETFramework4.8" />
       <group targetFramework=".NETCoreApp3.0" />
       <group targetFramework=".NETCoreApp3.1" />
@@ -29,47 +33,133 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="lib\net40\ca-ES\HandyControl.resources.dll" target="lib\net40\ca-ES\HandyControl.resources.dll" />
     <file src="lib\net40\en\HandyControl.resources.dll" target="lib\net40\en\HandyControl.resources.dll" />
     <file src="lib\net40\fa\HandyControl.resources.dll" target="lib\net40\fa\HandyControl.resources.dll" />
     <file src="lib\net40\fr\HandyControl.resources.dll" target="lib\net40\fr\HandyControl.resources.dll" />
     <file src="lib\net40\ko-KR\HandyControl.resources.dll" target="lib\net40\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net40\pl\HandyControl.resources.dll" target="lib\net40\pl\HandyControl.resources.dll" />
+    <file src="lib\net40\pt-BR\HandyControl.resources.dll" target="lib\net40\pt-BR\HandyControl.resources.dll" />
     <file src="lib\net40\ru\HandyControl.resources.dll" target="lib\net40\ru\HandyControl.resources.dll" />
     <file src="lib\net40\tr\HandyControl.resources.dll" target="lib\net40\tr\HandyControl.resources.dll" />
     <file src="lib\net40\HandyControl.dll" target="lib\net40\HandyControl.dll" />
     <file src="lib\net40\HandyControl.pdb" target="lib\net40\HandyControl.pdb" />
     <file src="lib\net40\HandyControl.xml" target="lib\net40\HandyControl.xml" />
-    <file src="lib\net40\Microsoft.Windows.Shell.dll" target="lib\net40\Microsoft.Windows.Shell.dll" />
+    <file src="lib\net45\ca-ES\HandyControl.resources.dll" target="lib\net45\ca-ES\HandyControl.resources.dll" />
     <file src="lib\net45\en\HandyControl.resources.dll" target="lib\net45\en\HandyControl.resources.dll" />
     <file src="lib\net45\fa\HandyControl.resources.dll" target="lib\net45\fa\HandyControl.resources.dll" />
     <file src="lib\net45\fr\HandyControl.resources.dll" target="lib\net45\fr\HandyControl.resources.dll" />
     <file src="lib\net45\ko-KR\HandyControl.resources.dll" target="lib\net45\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net45\pl\HandyControl.resources.dll" target="lib\net45\pl\HandyControl.resources.dll" />
+    <file src="lib\net45\pt-BR\HandyControl.resources.dll" target="lib\net45\pt-BR\HandyControl.resources.dll" />
     <file src="lib\net45\ru\HandyControl.resources.dll" target="lib\net45\ru\HandyControl.resources.dll" />
     <file src="lib\net45\tr\HandyControl.resources.dll" target="lib\net45\tr\HandyControl.resources.dll" />
     <file src="lib\net45\HandyControl.dll" target="lib\net45\HandyControl.dll" />
     <file src="lib\net45\HandyControl.pdb" target="lib\net45\HandyControl.pdb" />
     <file src="lib\net45\HandyControl.xml" target="lib\net45\HandyControl.xml" />
+    <file src="lib\net451\ca-ES\HandyControl.resources.dll" target="lib\net451\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net451\en\HandyControl.resources.dll" target="lib\net451\en\HandyControl.resources.dll" />
+    <file src="lib\net451\fa\HandyControl.resources.dll" target="lib\net451\fa\HandyControl.resources.dll" />
+    <file src="lib\net451\fr\HandyControl.resources.dll" target="lib\net451\fr\HandyControl.resources.dll" />
+    <file src="lib\net451\ko-KR\HandyControl.resources.dll" target="lib\net451\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net451\pl\HandyControl.resources.dll" target="lib\net451\pl\HandyControl.resources.dll" />
+    <file src="lib\net451\pt-BR\HandyControl.resources.dll" target="lib\net451\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net451\ru\HandyControl.resources.dll" target="lib\net451\ru\HandyControl.resources.dll" />
+    <file src="lib\net451\tr\HandyControl.resources.dll" target="lib\net451\tr\HandyControl.resources.dll" />
+    <file src="lib\net451\HandyControl.dll" target="lib\net451\HandyControl.dll" />
+    <file src="lib\net451\HandyControl.pdb" target="lib\net451\HandyControl.pdb" />
+    <file src="lib\net451\HandyControl.xml" target="lib\net451\HandyControl.xml" />
+    <file src="lib\net452\ca-ES\HandyControl.resources.dll" target="lib\net452\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net452\en\HandyControl.resources.dll" target="lib\net452\en\HandyControl.resources.dll" />
+    <file src="lib\net452\fa\HandyControl.resources.dll" target="lib\net452\fa\HandyControl.resources.dll" />
+    <file src="lib\net452\fr\HandyControl.resources.dll" target="lib\net452\fr\HandyControl.resources.dll" />
+    <file src="lib\net452\ko-KR\HandyControl.resources.dll" target="lib\net452\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net452\pl\HandyControl.resources.dll" target="lib\net452\pl\HandyControl.resources.dll" />
+    <file src="lib\net452\pt-BR\HandyControl.resources.dll" target="lib\net452\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net452\ru\HandyControl.resources.dll" target="lib\net452\ru\HandyControl.resources.dll" />
+    <file src="lib\net452\tr\HandyControl.resources.dll" target="lib\net452\tr\HandyControl.resources.dll" />
+    <file src="lib\net452\HandyControl.dll" target="lib\net452\HandyControl.dll" />
+    <file src="lib\net452\HandyControl.pdb" target="lib\net452\HandyControl.pdb" />
+    <file src="lib\net452\HandyControl.xml" target="lib\net452\HandyControl.xml" />
+    <file src="lib\net46\ca-ES\HandyControl.resources.dll" target="lib\net46\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net46\en\HandyControl.resources.dll" target="lib\net46\en\HandyControl.resources.dll" />
+    <file src="lib\net46\fa\HandyControl.resources.dll" target="lib\net46\fa\HandyControl.resources.dll" />
+    <file src="lib\net46\fr\HandyControl.resources.dll" target="lib\net46\fr\HandyControl.resources.dll" />
+    <file src="lib\net46\ko-KR\HandyControl.resources.dll" target="lib\net46\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net46\pl\HandyControl.resources.dll" target="lib\net46\pl\HandyControl.resources.dll" />
+    <file src="lib\net46\pt-BR\HandyControl.resources.dll" target="lib\net46\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net46\ru\HandyControl.resources.dll" target="lib\net46\ru\HandyControl.resources.dll" />
+    <file src="lib\net46\tr\HandyControl.resources.dll" target="lib\net46\tr\HandyControl.resources.dll" />
+    <file src="lib\net46\HandyControl.dll" target="lib\net46\HandyControl.dll" />
+    <file src="lib\net46\HandyControl.pdb" target="lib\net46\HandyControl.pdb" />
+    <file src="lib\net46\HandyControl.xml" target="lib\net46\HandyControl.xml" />
+    <file src="lib\net461\ca-ES\HandyControl.resources.dll" target="lib\net461\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net461\en\HandyControl.resources.dll" target="lib\net461\en\HandyControl.resources.dll" />
+    <file src="lib\net461\fa\HandyControl.resources.dll" target="lib\net461\fa\HandyControl.resources.dll" />
+    <file src="lib\net461\fr\HandyControl.resources.dll" target="lib\net461\fr\HandyControl.resources.dll" />
+    <file src="lib\net461\ko-KR\HandyControl.resources.dll" target="lib\net461\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net461\pl\HandyControl.resources.dll" target="lib\net461\pl\HandyControl.resources.dll" />
+    <file src="lib\net461\pt-BR\HandyControl.resources.dll" target="lib\net461\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net461\ru\HandyControl.resources.dll" target="lib\net461\ru\HandyControl.resources.dll" />
+    <file src="lib\net461\tr\HandyControl.resources.dll" target="lib\net461\tr\HandyControl.resources.dll" />
+    <file src="lib\net461\HandyControl.dll" target="lib\net461\HandyControl.dll" />
+    <file src="lib\net461\HandyControl.pdb" target="lib\net461\HandyControl.pdb" />
+    <file src="lib\net461\HandyControl.xml" target="lib\net461\HandyControl.xml" />
+    <file src="lib\net462\ca-ES\HandyControl.resources.dll" target="lib\net462\ca-ES\HandyControl.resources.dll" />
     <file src="lib\net462\en\HandyControl.resources.dll" target="lib\net462\en\HandyControl.resources.dll" />
     <file src="lib\net462\fa\HandyControl.resources.dll" target="lib\net462\fa\HandyControl.resources.dll" />
     <file src="lib\net462\fr\HandyControl.resources.dll" target="lib\net462\fr\HandyControl.resources.dll" />
     <file src="lib\net462\ko-KR\HandyControl.resources.dll" target="lib\net462\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net462\pl\HandyControl.resources.dll" target="lib\net462\pl\HandyControl.resources.dll" />
+    <file src="lib\net462\pt-BR\HandyControl.resources.dll" target="lib\net462\pt-BR\HandyControl.resources.dll" />
     <file src="lib\net462\ru\HandyControl.resources.dll" target="lib\net462\ru\HandyControl.resources.dll" />
     <file src="lib\net462\tr\HandyControl.resources.dll" target="lib\net462\tr\HandyControl.resources.dll" />
     <file src="lib\net462\HandyControl.dll" target="lib\net462\HandyControl.dll" />
     <file src="lib\net462\HandyControl.pdb" target="lib\net462\HandyControl.pdb" />
     <file src="lib\net462\HandyControl.xml" target="lib\net462\HandyControl.xml" />
+    <file src="lib\net47\ca-ES\HandyControl.resources.dll" target="lib\net47\ca-ES\HandyControl.resources.dll" />
     <file src="lib\net47\en\HandyControl.resources.dll" target="lib\net47\en\HandyControl.resources.dll" />
     <file src="lib\net47\fa\HandyControl.resources.dll" target="lib\net47\fa\HandyControl.resources.dll" />
     <file src="lib\net47\fr\HandyControl.resources.dll" target="lib\net47\fr\HandyControl.resources.dll" />
     <file src="lib\net47\ko-KR\HandyControl.resources.dll" target="lib\net47\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net47\pl\HandyControl.resources.dll" target="lib\net47\pl\HandyControl.resources.dll" />
+    <file src="lib\net47\pt-BR\HandyControl.resources.dll" target="lib\net47\pt-BR\HandyControl.resources.dll" />
     <file src="lib\net47\ru\HandyControl.resources.dll" target="lib\net47\ru\HandyControl.resources.dll" />
     <file src="lib\net47\tr\HandyControl.resources.dll" target="lib\net47\tr\HandyControl.resources.dll" />
     <file src="lib\net47\HandyControl.dll" target="lib\net47\HandyControl.dll" />
     <file src="lib\net47\HandyControl.pdb" target="lib\net47\HandyControl.pdb" />
     <file src="lib\net47\HandyControl.xml" target="lib\net47\HandyControl.xml" />
+    <file src="lib\net471\ca-ES\HandyControl.resources.dll" target="lib\net471\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net471\en\HandyControl.resources.dll" target="lib\net471\en\HandyControl.resources.dll" />
+    <file src="lib\net471\fa\HandyControl.resources.dll" target="lib\net471\fa\HandyControl.resources.dll" />
+    <file src="lib\net471\fr\HandyControl.resources.dll" target="lib\net471\fr\HandyControl.resources.dll" />
+    <file src="lib\net471\ko-KR\HandyControl.resources.dll" target="lib\net471\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net471\pl\HandyControl.resources.dll" target="lib\net471\pl\HandyControl.resources.dll" />
+    <file src="lib\net471\pt-BR\HandyControl.resources.dll" target="lib\net471\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net471\ru\HandyControl.resources.dll" target="lib\net471\ru\HandyControl.resources.dll" />
+    <file src="lib\net471\tr\HandyControl.resources.dll" target="lib\net471\tr\HandyControl.resources.dll" />
+    <file src="lib\net471\HandyControl.dll" target="lib\net471\HandyControl.dll" />
+    <file src="lib\net471\HandyControl.pdb" target="lib\net471\HandyControl.pdb" />
+    <file src="lib\net471\HandyControl.xml" target="lib\net471\HandyControl.xml" />
+    <file src="lib\net472\ca-ES\HandyControl.resources.dll" target="lib\net472\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net472\en\HandyControl.resources.dll" target="lib\net472\en\HandyControl.resources.dll" />
+    <file src="lib\net472\fa\HandyControl.resources.dll" target="lib\net472\fa\HandyControl.resources.dll" />
+    <file src="lib\net472\fr\HandyControl.resources.dll" target="lib\net472\fr\HandyControl.resources.dll" />
+    <file src="lib\net472\ko-KR\HandyControl.resources.dll" target="lib\net472\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net472\pl\HandyControl.resources.dll" target="lib\net472\pl\HandyControl.resources.dll" />
+    <file src="lib\net472\pt-BR\HandyControl.resources.dll" target="lib\net472\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net472\ru\HandyControl.resources.dll" target="lib\net472\ru\HandyControl.resources.dll" />
+    <file src="lib\net472\tr\HandyControl.resources.dll" target="lib\net472\tr\HandyControl.resources.dll" />
+    <file src="lib\net472\HandyControl.dll" target="lib\net472\HandyControl.dll" />
+    <file src="lib\net472\HandyControl.pdb" target="lib\net472\HandyControl.pdb" />
+    <file src="lib\net472\HandyControl.xml" target="lib\net472\HandyControl.xml" />
+    <file src="lib\net48\ca-ES\HandyControl.resources.dll" target="lib\net48\ca-ES\HandyControl.resources.dll" />
     <file src="lib\net48\en\HandyControl.resources.dll" target="lib\net48\en\HandyControl.resources.dll" />
     <file src="lib\net48\fa\HandyControl.resources.dll" target="lib\net48\fa\HandyControl.resources.dll" />
     <file src="lib\net48\fr\HandyControl.resources.dll" target="lib\net48\fr\HandyControl.resources.dll" />
     <file src="lib\net48\ko-KR\HandyControl.resources.dll" target="lib\net48\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net48\pl\HandyControl.resources.dll" target="lib\net48\pl\HandyControl.resources.dll" />
+    <file src="lib\net48\pt-BR\HandyControl.resources.dll" target="lib\net48\pt-BR\HandyControl.resources.dll" />
     <file src="lib\net48\ru\HandyControl.resources.dll" target="lib\net48\ru\HandyControl.resources.dll" />
     <file src="lib\net48\tr\HandyControl.resources.dll" target="lib\net48\tr\HandyControl.resources.dll" />
     <file src="lib\net48\HandyControl.dll" target="lib\net48\HandyControl.dll" />
@@ -80,6 +170,7 @@
     <file src="lib\net5.0-windows\fa\HandyControl.resources.dll" target="lib\net5.0-windows\fa\HandyControl.resources.dll" />
     <file src="lib\net5.0-windows\fr\HandyControl.resources.dll" target="lib\net5.0-windows\fr\HandyControl.resources.dll" />
     <file src="lib\net5.0-windows\ko-KR\HandyControl.resources.dll" target="lib\net5.0-windows\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net5.0-windows\pl\HandyControl.resources.dll" target="lib\net5.0-windows\pl\HandyControl.resources.dll" />
     <file src="lib\net5.0-windows\pt-BR\HandyControl.resources.dll" target="lib\net5.0-windows\pt-BR\HandyControl.resources.dll" />
     <file src="lib\net5.0-windows\ref\HandyControl.dll" target="lib\net5.0-windows\ref\HandyControl.dll" />
     <file src="lib\net5.0-windows\ru\HandyControl.resources.dll" target="lib\net5.0-windows\ru\HandyControl.resources.dll" />
@@ -88,20 +179,26 @@
     <file src="lib\net5.0-windows\HandyControl.dll" target="lib\net5.0-windows\HandyControl.dll" />
     <file src="lib\net5.0-windows\HandyControl.pdb" target="lib\net5.0-windows\HandyControl.pdb" />
     <file src="lib\net5.0-windows\HandyControl.xml" target="lib\net5.0-windows\HandyControl.xml" />
+    <file src="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\en\HandyControl.resources.dll" target="lib\netcoreapp3.0\en\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fa\HandyControl.resources.dll" target="lib\netcoreapp3.0\fa\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fr\HandyControl.resources.dll" target="lib\netcoreapp3.0\fr\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\ko-KR\HandyControl.resources.dll" target="lib\netcoreapp3.0\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\pl\HandyControl.resources.dll" target="lib\netcoreapp3.0\pl\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\pt-BR\HandyControl.resources.dll" target="lib\netcoreapp3.0\pt-BR\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\ru\HandyControl.resources.dll" target="lib\netcoreapp3.0\ru\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\tr\HandyControl.resources.dll" target="lib\netcoreapp3.0\tr\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\HandyControl.deps.json" target="lib\netcoreapp3.0\HandyControl.deps.json" />
     <file src="lib\netcoreapp3.0\HandyControl.dll" target="lib\netcoreapp3.0\HandyControl.dll" />
     <file src="lib\netcoreapp3.0\HandyControl.pdb" target="lib\netcoreapp3.0\HandyControl.pdb" />
     <file src="lib\netcoreapp3.0\HandyControl.xml" target="lib\netcoreapp3.0\HandyControl.xml" />
+    <file src="lib\netcoreapp3.1\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.1\ca-ES\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\en\HandyControl.resources.dll" target="lib\netcoreapp3.1\en\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\fa\HandyControl.resources.dll" target="lib\netcoreapp3.1\fa\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\fr\HandyControl.resources.dll" target="lib\netcoreapp3.1\fr\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\ko-KR\HandyControl.resources.dll" target="lib\netcoreapp3.1\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\pl\HandyControl.resources.dll" target="lib\netcoreapp3.1\pl\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\pt-BR\HandyControl.resources.dll" target="lib\netcoreapp3.1\pt-BR\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\ru\HandyControl.resources.dll" target="lib\netcoreapp3.1\ru\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\tr\HandyControl.resources.dll" target="lib\netcoreapp3.1\tr\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\HandyControl.deps.json" target="lib\netcoreapp3.1\HandyControl.deps.json" />

From 72e8d563c9cced4f04c847c80c7c3632223fa5a8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 23 Mar 2021 00:57:48 +0800
Subject: [PATCH 12/56] Update build.nuspec

---
 build/build.nuspec | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/build/build.nuspec b/build/build.nuspec
index d20ac159..a2ca3d6d 100644
--- a/build/build.nuspec
+++ b/build/build.nuspec
@@ -165,20 +165,20 @@
     <file src="lib\net48\HandyControl.dll" target="lib\net48\HandyControl.dll" />
     <file src="lib\net48\HandyControl.pdb" target="lib\net48\HandyControl.pdb" />
     <file src="lib\net48\HandyControl.xml" target="lib\net48\HandyControl.xml" />
-    <file src="lib\net5.0-windows\ca-ES\HandyControl.resources.dll" target="lib\net5.0-windows\ca-ES\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\en\HandyControl.resources.dll" target="lib\net5.0-windows\en\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\fa\HandyControl.resources.dll" target="lib\net5.0-windows\fa\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\fr\HandyControl.resources.dll" target="lib\net5.0-windows\fr\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\ko-KR\HandyControl.resources.dll" target="lib\net5.0-windows\ko-KR\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\pl\HandyControl.resources.dll" target="lib\net5.0-windows\pl\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\pt-BR\HandyControl.resources.dll" target="lib\net5.0-windows\pt-BR\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\ref\HandyControl.dll" target="lib\net5.0-windows\ref\HandyControl.dll" />
-    <file src="lib\net5.0-windows\ru\HandyControl.resources.dll" target="lib\net5.0-windows\ru\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\tr\HandyControl.resources.dll" target="lib\net5.0-windows\tr\HandyControl.resources.dll" />
-    <file src="lib\net5.0-windows\HandyControl.deps.json" target="lib\net5.0-windows\HandyControl.deps.json" />
-    <file src="lib\net5.0-windows\HandyControl.dll" target="lib\net5.0-windows\HandyControl.dll" />
-    <file src="lib\net5.0-windows\HandyControl.pdb" target="lib\net5.0-windows\HandyControl.pdb" />
-    <file src="lib\net5.0-windows\HandyControl.xml" target="lib\net5.0-windows\HandyControl.xml" />
+    <file src="lib\net5.0\ca-ES\HandyControl.resources.dll" target="lib\net5.0\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net5.0\en\HandyControl.resources.dll" target="lib\net5.0\en\HandyControl.resources.dll" />
+    <file src="lib\net5.0\fa\HandyControl.resources.dll" target="lib\net5.0\fa\HandyControl.resources.dll" />
+    <file src="lib\net5.0\fr\HandyControl.resources.dll" target="lib\net5.0\fr\HandyControl.resources.dll" />
+    <file src="lib\net5.0\ko-KR\HandyControl.resources.dll" target="lib\net5.0\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net5.0\pl\HandyControl.resources.dll" target="lib\net5.0\pl\HandyControl.resources.dll" />
+    <file src="lib\net5.0\pt-BR\HandyControl.resources.dll" target="lib\net5.0\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net5.0\ref\HandyControl.dll" target="lib\net5.0\ref\HandyControl.dll" />
+    <file src="lib\net5.0\ru\HandyControl.resources.dll" target="lib\net5.0\ru\HandyControl.resources.dll" />
+    <file src="lib\net5.0\tr\HandyControl.resources.dll" target="lib\net5.0\tr\HandyControl.resources.dll" />
+    <file src="lib\net5.0\HandyControl.deps.json" target="lib\net5.0\HandyControl.deps.json" />
+    <file src="lib\net5.0\HandyControl.dll" target="lib\net5.0\HandyControl.dll" />
+    <file src="lib\net5.0\HandyControl.pdb" target="lib\net5.0\HandyControl.pdb" />
+    <file src="lib\net5.0\HandyControl.xml" target="lib\net5.0\HandyControl.xml" />
     <file src="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\en\HandyControl.resources.dll" target="lib\netcoreapp3.0\en\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fa\HandyControl.resources.dll" target="lib\netcoreapp3.0\fa\HandyControl.resources.dll" />

From 580193133b2d8901e5347312d10b719b51896bb7 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 23 Mar 2021 00:58:34 +0800
Subject: [PATCH 13/56] Update build.cake

---
 build/build.cake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.cake b/build/build.cake
index 7bd507a7..34b6f839 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -104,7 +104,7 @@ Task("Build")
     {
         Configuration = "Release",
         Framework = "net5.0-windows",
-        OutputDirectory = "lib/net5.0-windows"
+        OutputDirectory = "lib/net5.0"
     };
 
     DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40);

From 0762db0fb4b4a7378d8b8b783d09d30e7c306092 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 23 Mar 2021 22:44:40 +0800
Subject: [PATCH 14/56] bump up vsix to 3.1.0

---
 Installers/VS2019/HandyControl_VS2019.sln     |  6 +++
 .../HandyControl_VS2019.csproj                | 12 +++--
 .../HandyControl_VS2019Package.cs             | 53 ------------------
 .../VS2019/HandyControl_VS2019/License.txt    |  4 +-
 .../Properties/AssemblyInfo.cs                |  6 +--
 .../source.extension.vsixmanifest             |  5 +-
 Installers/VS2019/WpfApp/AssemblyInfo.cs      |  2 +-
 .../VS2019/WpfApp/ProjectTemplate.csproj      | 14 ++---
 .../VS2019/WpfApp/Properties/AssemblyInfo.cs  |  6 +--
 Installers/VS2019/WpfApp/WpfApp.csproj        |  1 -
 Installers/VS2019/WpfApp/WpfApp.vstemplate    | 54 +++++++++----------
 Installers/VS2019/WpfApp/packages.config      |  4 --
 Installers/VS2019/WpfCoreApp/AssemblyInfo.cs  |  3 ++
 .../VS2019/WpfCoreApp/ProjectTemplate.csproj  | 25 ++++-----
 .../WpfCoreApp/Properties/AssemblyInfo.cs     |  6 +--
 .../VS2019/WpfCoreApp/WpfCoreApp.csproj       |  1 +
 .../VS2019/WpfCoreApp/WpfCoreApp.vstemplate   | 51 +++++++++---------
 README-cn.md                                  |  2 +-
 README.md                                     |  2 +-
 19 files changed, 101 insertions(+), 156 deletions(-)
 delete mode 100644 Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019Package.cs
 delete mode 100644 Installers/VS2019/WpfApp/packages.config
 create mode 100644 Installers/VS2019/WpfCoreApp/AssemblyInfo.cs

diff --git a/Installers/VS2019/HandyControl_VS2019.sln b/Installers/VS2019/HandyControl_VS2019.sln
index 2c1629ff..78ca7aa9 100644
--- a/Installers/VS2019/HandyControl_VS2019.sln
+++ b/Installers/VS2019/HandyControl_VS2019.sln
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp", "WpfApp\WpfApp.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfCoreApp", "WpfCoreApp\WpfCoreApp.csproj", "{2F6E9FB8-F579-40CF-A151-57F281F08E1B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Templates", "Project Templates", "{26BC7FA1-50F7-46C7-84FE-0D8ABAC47E07}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,6 +33,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{83C70EB1-3A3F-4812-B86C-C7D1936699EB} = {26BC7FA1-50F7-46C7-84FE-0D8ABAC47E07}
+		{2F6E9FB8-F579-40CF-A151-57F281F08E1B} = {26BC7FA1-50F7-46C7-84FE-0D8ABAC47E07}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A7F567D2-5FA3-4E17-A8A8-CDAFC217BFF5}
 	EndGlobalSection
diff --git a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj b/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj
index ba720bad..633bf020 100644
--- a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj
+++ b/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj
@@ -16,7 +16,7 @@
     <RootNamespace>HandyControl_VS2019</RootNamespace>
     <AssemblyName>HandyControl_VS2019</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <GeneratePkgDefFile>true</GeneratePkgDefFile>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <UseCodebase>true</UseCodebase>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -46,7 +46,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="HandyControl_VS2019Package.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
@@ -57,8 +56,13 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.9.3" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.0.2268" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.8.3038">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="icon_100_100.png">
diff --git a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019Package.cs b/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019Package.cs
deleted file mode 100644
index 10e0ebb6..00000000
--- a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019Package.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Microsoft.VisualStudio.Shell;
-using Task = System.Threading.Tasks.Task;
-
-namespace HandyControl_VS2019
-{
-    /// <summary>
-    /// This is the class that implements the package exposed by this assembly.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// The minimum requirement for a class to be considered a valid package for Visual Studio
-    /// is to implement the IVsPackage interface and register itself with the shell.
-    /// This package uses the helper classes defined inside the Managed Package Framework (MPF)
-    /// to do it: it derives from the Package class that provides the implementation of the
-    /// IVsPackage interface and uses the registration attributes defined in the framework to
-    /// register itself and its components with the shell. These attributes tell the pkgdef creation
-    /// utility what data to put into .pkgdef file.
-    /// </para>
-    /// <para>
-    /// To get loaded into VS, the package must be referred by &lt;Asset Type="Microsoft.VisualStudio.VsPackage" ...&gt; in .vsixmanifest file.
-    /// </para>
-    /// </remarks>
-    [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [Guid(PackageGuidString)]
-    public sealed class HandyControl_VS2019Package : AsyncPackage
-    {
-        /// <summary>
-        /// HandyControl_VS2019Package GUID string.
-        /// </summary>
-        public const string PackageGuidString = "157ef242-83b5-47d0-8f2f-e21dc8308151";
-
-        #region Package Members
-
-        /// <summary>
-        /// Initialization of the package; this method is called right after the package is sited, so this is the place
-        /// where you can put all the initialization code that rely on services provided by VisualStudio.
-        /// </summary>
-        /// <param name="cancellationToken">A cancellation token to monitor for initialization cancellation, which can occur when VS is shutting down.</param>
-        /// <param name="progress">A provider for progress updates.</param>
-        /// <returns>A task representing the async work of package initialization, or an already completed task if there is none. Do not return null from this method.</returns>
-        protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
-        {
-            // When initialized asynchronously, the current thread may be a background thread at this point.
-            // Do any initialization that requires the UI thread after switching to the UI thread.
-            await this.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
-        }
-
-        #endregion
-    }
-}
diff --git a/Installers/VS2019/HandyControl_VS2019/License.txt b/Installers/VS2019/HandyControl_VS2019/License.txt
index 0c1c18de..ce89800c 100644
--- a/Installers/VS2019/HandyControl_VS2019/License.txt
+++ b/Installers/VS2019/HandyControl_VS2019/License.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2020 HandyOrg
+Copyright (c) 2018-2021 HandyOrg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs
index 94d87828..c8e705aa 100644
--- a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs
+++ b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs
@@ -6,9 +6,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HandyControl_VS2019")]
-[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
+[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.1.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.1.0")]
+[assembly: AssemblyFileVersion("3.1.0")]
diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest
index 74e40f35..37afe1af 100644
--- a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest
+++ b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="5949c79d-eb43-4033-8b7b-9349d34512c6" Version="2.5.0" Language="en-US" Publisher="HandyOrg" />
+        <Identity Id="1B6729DF-3360-48C4-86A9-68A0591FBBEB" Version="3.1.0" Language="en-US" Publisher="HandyOrg" />
         <DisplayName>HandyControl for VS2019</DisplayName>
         <Description xml:space="preserve">This VSIX Project will help people initialize a HandyControl project.</Description>
         <MoreInfo>https://handyorg.github.io/handycontrol</MoreInfo>
@@ -21,10 +21,9 @@
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.0,)" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[16.2.29003.222,17.0)" DisplayName=".NET 桌面开发工具" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
-        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
         <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WpfApp" d:TargetPath="|WpfApp;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
         <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WpfCoreApp" d:TargetPath="|WpfCoreApp;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
     </Assets>
diff --git a/Installers/VS2019/WpfApp/AssemblyInfo.cs b/Installers/VS2019/WpfApp/AssemblyInfo.cs
index 9eac2dc2..a3e3ceb3 100644
--- a/Installers/VS2019/WpfApp/AssemblyInfo.cs
+++ b/Installers/VS2019/WpfApp/AssemblyInfo.cs
@@ -7,7 +7,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("$safeprojectname$")]
-[assembly: AssemblyCopyright("Copyright © $username$ 2019")]
+[assembly: AssemblyCopyright("Copyright © $username$ $year$")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Installers/VS2019/WpfApp/ProjectTemplate.csproj b/Installers/VS2019/WpfApp/ProjectTemplate.csproj
index d6cec36e..fda36524 100644
--- a/Installers/VS2019/WpfApp/ProjectTemplate.csproj
+++ b/Installers/VS2019/WpfApp/ProjectTemplate.csproj
@@ -8,9 +8,8 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>$safeprojectname$</RootNamespace>
     <AssemblyName>$safeprojectname$</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -34,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HandyControl, Version=2.5.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HandyControl.2.5.0.1\lib\net47\HandyControl.dll</HintPath>
-    </Reference>
+    <PackageReference Include="HandyControl" Version="3.1" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
@@ -68,8 +67,5 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs
index e2fda6dc..615ae4ce 100644
--- a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs
+++ b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs
@@ -6,9 +6,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HandyControl_VS2019_WpfApp")]
-[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
+[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyVersion("3.1.0")]
+[assembly: AssemblyFileVersion("3.1.0")]
diff --git a/Installers/VS2019/WpfApp/WpfApp.csproj b/Installers/VS2019/WpfApp/WpfApp.csproj
index 5c42f1ff..03c2fe4e 100644
--- a/Installers/VS2019/WpfApp/WpfApp.csproj
+++ b/Installers/VS2019/WpfApp/WpfApp.csproj
@@ -66,7 +66,6 @@
     <VSTemplate Include="WpfApp.vstemplate" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="ProjectTemplate.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Installers/VS2019/WpfApp/WpfApp.vstemplate b/Installers/VS2019/WpfApp/WpfApp.vstemplate
index 69f0d286..34f4c6fb 100644
--- a/Installers/VS2019/WpfApp/WpfApp.vstemplate
+++ b/Installers/VS2019/WpfApp/WpfApp.vstemplate
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010">
-  <TemplateData>
-    <Name>HandyControl WPF App(.NET Framework)</Name>
-    <Description>Creates a HandyControl WPF App(.NET Framework)</Description>
-    <Icon>icon.ico</Icon>
-    <ProjectType>CSharp</ProjectType>
-    <RequiredFrameworkVersion>4.7</RequiredFrameworkVersion>
-    <MaxFrameworkVersion>4.7.2</MaxFrameworkVersion>
-    <TemplateID>38e0a2df-5858-4bde-b373-7c50bc982906</TemplateID>
-    <CreateNewFolder>true</CreateNewFolder>
-    <DefaultName>HandyControlProject</DefaultName>
-    <ProvideDefaultName>true</ProvideDefaultName>
-    <LanguageTag>csharp</LanguageTag>
-    <PlatformTag>windows</PlatformTag>
-    <ProjectTypeTag>desktop</ProjectTypeTag>
-    <ProjectTypeTag>HandyControl</ProjectTypeTag>
-  </TemplateData>
-  <TemplateContent>
-    <Project File="ProjectTemplate.csproj" ReplaceParameters="true">
-      <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml">App.xaml</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml.cs">App.xaml.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="MainWindow.xaml">MainWindow.xaml</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="MainWindow.xaml.cs">MainWindow.xaml.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="packages.config">packages.config</ProjectItem>
-    </Project>
-  </TemplateContent>
-</VSTemplate>
\ No newline at end of file
+    <TemplateData>
+        <Name>HandyControl WPF App (.NET Framework)</Name>
+        <Description>Creates a HandyControl WPF App (.NET Framework)</Description>
+        <Icon>icon.ico</Icon>
+        <ProjectType>CSharp</ProjectType>
+        <RequiredFrameworkVersion>4.0</RequiredFrameworkVersion>
+        <CreateNewFolder>true</CreateNewFolder>
+        <DefaultName>HandyControlWpfApp</DefaultName>
+        <ProvideDefaultName>true</ProvideDefaultName>
+        <LanguageTag>csharp</LanguageTag>
+        <PlatformTag>windows</PlatformTag>
+        <ProjectTypeTag>desktop</ProjectTypeTag>
+        <ProjectTypeTag>HandyControl</ProjectTypeTag>
+        <LocationField>Enabled</LocationField>
+        <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
+        <CreateInPlace>true</CreateInPlace>
+    </TemplateData>
+    <TemplateContent>
+        <Project File="ProjectTemplate.csproj" ReplaceParameters="true">
+            <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
+            <ProjectItem ReplaceParameters="true">App.xaml</ProjectItem>
+            <ProjectItem ReplaceParameters="true">App.xaml.cs</ProjectItem>
+            <ProjectItem ReplaceParameters="true">MainWindow.xaml</ProjectItem>
+            <ProjectItem ReplaceParameters="true">MainWindow.xaml.cs</ProjectItem>
+        </Project>
+    </TemplateContent>
+</VSTemplate>
diff --git a/Installers/VS2019/WpfApp/packages.config b/Installers/VS2019/WpfApp/packages.config
deleted file mode 100644
index 9e25ff12..00000000
--- a/Installers/VS2019/WpfApp/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="HandyControl" version="2.5.0.1" targetFramework="net47" />
-</packages>
\ No newline at end of file
diff --git a/Installers/VS2019/WpfCoreApp/AssemblyInfo.cs b/Installers/VS2019/WpfCoreApp/AssemblyInfo.cs
new file mode 100644
index 00000000..9ef4842b
--- /dev/null
+++ b/Installers/VS2019/WpfCoreApp/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Windows;
+
+[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
diff --git a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj
index 9b17e7cd..0cf79316 100644
--- a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj
+++ b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj
@@ -1,24 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <AssemblyName>$safeprojectname$</AssemblyName>
-    <RootNamespace>$safeprojectname$</RootNamespace>
-    <Version>1.0.0.0</Version>
-    <Configurations>Debug;Release</Configurations>
-    <Copyright>Copyright © $username$ 2018-2020</Copyright>
-    <FileVersion>1.0.0.0</FileVersion>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <Copyright>Copyright © $username$ $year$</Copyright>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;Core</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>TRACE;Core</DefineConstants>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="HandyControl" Version="2.5.0.1" />
+    <PackageReference Include="HandyControl" Version="3.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs
index 6ca08ca9..9f047401 100644
--- a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs
+++ b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs
@@ -6,9 +6,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HandyControl_VS2019_WpfCoreApp")]
-[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
+[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyVersion("3.1.0")]
+[assembly: AssemblyFileVersion("3.1.0")]
diff --git a/Installers/VS2019/WpfCoreApp/WpfCoreApp.csproj b/Installers/VS2019/WpfCoreApp/WpfCoreApp.csproj
index 6a55e8df..baf227fc 100644
--- a/Installers/VS2019/WpfCoreApp/WpfCoreApp.csproj
+++ b/Installers/VS2019/WpfCoreApp/WpfCoreApp.csproj
@@ -60,6 +60,7 @@
     <None Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </None>
+    <None Include="AssemblyInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Installers/VS2019/WpfCoreApp/WpfCoreApp.vstemplate b/Installers/VS2019/WpfCoreApp/WpfCoreApp.vstemplate
index 532eaeaf..9d39835d 100644
--- a/Installers/VS2019/WpfCoreApp/WpfCoreApp.vstemplate
+++ b/Installers/VS2019/WpfCoreApp/WpfCoreApp.vstemplate
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010">
-  <TemplateData>
-    <Name>HandyControl WPF App(.NET Core)</Name>
-    <Description>Creates a HandyControl WPF App(.NET Core)</Description>
-    <Icon>icon.ico</Icon>
-    <ProjectType>CSharp</ProjectType>
-    <CreateNewFolder>true</CreateNewFolder>
-    <DefaultName>HandyControlProject</DefaultName>
-    <ProvideDefaultName>true</ProvideDefaultName>
-    <LanguageTag>csharp</LanguageTag>
-    <PlatformTag>windows</PlatformTag>
-    <ProjectTypeTag>desktop</ProjectTypeTag>
-    <ProjectTypeTag>HandyControl</ProjectTypeTag>
-    <LocationField>Enabled</LocationField>
-    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
-    <CreateInPlace>true</CreateInPlace>
-  </TemplateData>
-  <TemplateContent>
-    <Project File="ProjectTemplate.csproj" ReplaceParameters="true">
-      <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml">App.xaml</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml.cs">App.xaml.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="MainWindow.xaml">MainWindow.xaml</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="MainWindow.xaml.cs">MainWindow.xaml.cs</ProjectItem>
-    </Project>
-  </TemplateContent>
-</VSTemplate>
\ No newline at end of file
+    <TemplateData>
+        <Name>HandyControl WPF App (.NET Core)</Name>
+        <Description>Creates a HandyControl WPF App (.NET Core)</Description>
+        <Icon>icon.ico</Icon>
+        <ProjectType>CSharp</ProjectType>
+        <CreateNewFolder>true</CreateNewFolder>
+        <DefaultName>HandyControlWpfCoreApp</DefaultName>
+        <ProvideDefaultName>true</ProvideDefaultName>
+        <LanguageTag>csharp</LanguageTag>
+        <PlatformTag>windows</PlatformTag>
+        <ProjectTypeTag>desktop</ProjectTypeTag>
+        <ProjectTypeTag>HandyControl</ProjectTypeTag>
+        <LocationField>Enabled</LocationField>
+        <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
+        <CreateInPlace>true</CreateInPlace>
+    </TemplateData>
+    <TemplateContent>
+        <Project File="ProjectTemplate.csproj" ReplaceParameters="true">
+            <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
+            <ProjectItem ReplaceParameters="true">App.xaml</ProjectItem>
+            <ProjectItem ReplaceParameters="true">App.xaml.cs</ProjectItem>
+            <ProjectItem ReplaceParameters="true">MainWindow.xaml</ProjectItem>
+            <ProjectItem ReplaceParameters="true">MainWindow.xaml.cs</ProjectItem>
+        </Project>
+    </TemplateContent>
+</VSTemplate>
diff --git a/README-cn.md b/README-cn.md
index 9d1eefc0..83f0ff80 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -167,7 +167,7 @@ Step 4: Enjoy coding
 
 ## VS插件
 
-| [VS2019](https://marketplace.visualstudio.com/items?itemName=HandyOrg.handycontrolforvs2019) |
+| [VS2019](https://marketplace.visualstudio.com/items?itemName=HandyOrg.HandyControl) |
 | ------------- |
 
 ## Star趋势
diff --git a/README.md b/README.md
index f5fe3f38..61e3bf7b 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,7 @@ Step 4: Enjoy coding
 
 ## VSIX packages for Visual Studio
 
-| [VS2019](https://marketplace.visualstudio.com/items?itemName=HandyOrg.handycontrolforvs2019) |
+| [VS2019](https://marketplace.visualstudio.com/items?itemName=HandyOrg.HandyControl) |
 | ------------- |
 
 ## Stargazers over time

From ad83effdfe63665b24371151d4ac8a48ad78c7e3 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 28 Mar 2021 12:41:08 +0800
Subject: [PATCH 15/56] fixed #752

---
 .../Controls/Input/CheckComboBox/CheckComboBox.cs              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
index ed8b4ab8..9b9b0baf 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
@@ -239,7 +239,6 @@ namespace HandyControl.Controls
             }
 
             _panel.Children.Clear();
-            var dataContext = DataContext;
 
             foreach (var item in SelectedItems)
             {
@@ -251,7 +250,7 @@ namespace HandyControl.Controls
                         Tag = checkComboBoxItem
                     };
 
-                    if (dataContext != null)
+                    if (ItemsSource != null)
                     {
                         tag.SetBinding(ContentControl.ContentProperty, new Binding(DisplayMemberPath) { Source = item });
                     }

From ad32fc889f6e0b9f3054f7421f147ee297f99b63 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 28 Mar 2021 13:06:21 +0800
Subject: [PATCH 16/56] fixed #748

---
 .../Controls/Other/NotifyIcon.cs              | 51 +++++++++----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index 6f196d76..db976dfd 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -578,37 +578,34 @@ namespace HandyControl.Controls
 
         private IntPtr Callback(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)
         {
-            if (IsLoaded)
+            if (msg == _wmTaskbarCreated)
             {
-                if (msg == _wmTaskbarCreated)
+                if (_messageWindowHandle == hWnd && Visibility == Visibility.Visible)
                 {
-                    if (_messageWindowHandle == hWnd && Visibility == Visibility.Visible)
-                    {
-                        UpdateIcon(true);
-                    }
+                    UpdateIcon(true);
                 }
-                else
+            }
+            else
+            {
+                switch (lparam.ToInt64())
                 {
-                    switch (lparam.ToInt64())
-                    {
-                        case InteropValues.WM_LBUTTONDBLCLK:
-                            WmMouseDown(MouseButton.Left, 2);
-                            break;
-                        case InteropValues.WM_LBUTTONUP:
-                            WmMouseUp(MouseButton.Left);
-                            break;
-                        case InteropValues.WM_RBUTTONUP:
-                            ShowContextMenu();
-                            WmMouseUp(MouseButton.Right);
-                            break;
-                        case InteropValues.WM_MOUSEMOVE:
-                            if (!_dispatcherTimerPos.IsEnabled)
-                            {
-                                _dispatcherTimerPos.Interval = TimeSpan.FromMilliseconds(200);
-                                _dispatcherTimerPos.Start();
-                            }
-                            break;
-                    }
+                    case InteropValues.WM_LBUTTONDBLCLK:
+                        WmMouseDown(MouseButton.Left, 2);
+                        break;
+                    case InteropValues.WM_LBUTTONUP:
+                        WmMouseUp(MouseButton.Left);
+                        break;
+                    case InteropValues.WM_RBUTTONUP:
+                        ShowContextMenu();
+                        WmMouseUp(MouseButton.Right);
+                        break;
+                    case InteropValues.WM_MOUSEMOVE:
+                        if (!_dispatcherTimerPos.IsEnabled)
+                        {
+                            _dispatcherTimerPos.Interval = TimeSpan.FromMilliseconds(200);
+                            _dispatcherTimerPos.Start();
+                        }
+                        break;
                 }
             }
 

From 7cc4640bb2c598317bb96fd483c18d3d389c4c26 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 28 Mar 2021 15:11:45 +0800
Subject: [PATCH 17/56] fixed #717

---
 .../HandyControl_Shared/Controls/SideMenu/SideMenu.cs     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
index a296ea52..e57821c2 100644
--- a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
+++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
@@ -99,6 +99,14 @@ namespace HandyControl.Controls
                         }
                         _isItemSelected = false;
                     }
+
+                    if (!item.HasItems)
+                    {
+                        RaiseEvent(new FunctionEventArgs<object>(SelectionChangedEvent, this)
+                        {
+                            Info = e.OriginalSource
+                        });
+                    }
                 }
             }
         }

From 04eb5cf73aa9c0e60a3aaffe272132e73344a043 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 30 Mar 2021 00:05:24 +0800
Subject: [PATCH 18/56] fixed a bug of Loading

Storyboard will not pause if IsRunning is asigned a value of false in xaml
---
 .../HandyControl_Shared/Controls/Loading/LoadingCircle.cs     | 4 ++++
 .../HandyControl_Shared/Controls/Loading/LoadingLine.cs       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
index e6dacdac..1d644160 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
@@ -180,6 +180,10 @@ namespace HandyControl.Controls
             }
 
             Storyboard.Begin();
+            if (!IsRunning)
+            {
+                Storyboard.Pause();
+            }
         }
 
         private Border CreateBorder(int index, double dotInterval, bool needHidden)
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
index 49bca631..b8976dca 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
@@ -98,6 +98,10 @@ namespace HandyControl.Controls
             }
 
             Storyboard.Begin();
+            if (!IsRunning)
+            {
+                Storyboard.Pause();
+            }
         }
 
         private Ellipse CreateEllipse(int index, double dotInterval, double dotDiameter)

From 152d3decf31a2549021104b7708db4b236b73b2e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 30 Mar 2021 22:04:47 +0800
Subject: [PATCH 19/56] update ProgressBar style

---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml             | 5 ++++-
 .../Themes/Styles/Base/ProgressBarBaseStyle.xaml             | 5 ++++-
 src/Shared/HandyControl_Shared/Themes/Theme.xaml             | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index e5383bd3..61fcfd3f 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -2397,10 +2397,13 @@
 					<Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
 						<hc:SimplePanel>
 							<Rectangle x:Name="PART_Track" />
+							<TextBlock Visibility="{Binding Visibility,ElementName=PART_GlowRect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
 							<Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
 								<hc:SimplePanel>
 									<Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
-										<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+										<Border Width="{Binding ActualWidth,ElementName=TemplateRoot}">
+											<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+										</Border>
 									</Border>
 									<Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100" />
 									<Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index dbf5caab..e5e05e1e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -52,10 +52,13 @@
                     <Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
                         <hc:SimplePanel>
                             <Rectangle x:Name="PART_Track"/>
+                            <TextBlock Visibility="{Binding Visibility,ElementName=PART_GlowRect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}"/>
                             <Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
                                 <hc:SimplePanel>
                                     <Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
-                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}"/>
+                                        <Border Width="{Binding ActualWidth,ElementName=TemplateRoot}">
+                                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}"/>
+                                        </Border>
                                     </Border>
                                     <Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100"/>
                                     <Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 96d20c2a..23111f0e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -2397,10 +2397,13 @@
 					<Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
 						<hc:SimplePanel>
 							<Rectangle x:Name="PART_Track" />
+							<TextBlock Visibility="{Binding Visibility,ElementName=PART_GlowRect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
 							<Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
 								<hc:SimplePanel>
 									<Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
-										<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+										<Border Width="{Binding ActualWidth,ElementName=TemplateRoot}">
+											<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+										</Border>
 									</Border>
 									<Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100" />
 									<Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">

From bf26f268bd40a512fe0d55ab55016d8ecd6a3e65 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 1 Apr 2021 21:32:37 +0800
Subject: [PATCH 20/56] fixed #758

---
 .../Controls/Image/GifImage.cs                | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
index a965eb7d..9771070f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
@@ -21,6 +21,8 @@ namespace HandyControl.Controls
     {
         private static readonly Guid GifGuid = new Guid("{b96b3caa-0728-11d3-9d7b-0000f81ef32e}");
 
+        private static readonly Guid GifSingleFrameGuid = new Guid("{b96b3cb0-0728-11d3-9d7b-0000f81ef32e}");
+
         internal IntPtr NativeImage;
 
         private byte[] _rawData;
@@ -39,12 +41,12 @@ namespace HandyControl.Controls
 
         private static void OnUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var ctl = (GifImage) d;
+            var ctl = (GifImage)d;
             ctl.StopAnimate();
 
             if (e.NewValue != null)
             {
-                var v = (Uri) e.NewValue;
+                var v = (Uri)e.NewValue;
                 ctl.GetGifStreamFromPack(v);
                 ctl.StartAnimate();
             }
@@ -56,16 +58,16 @@ namespace HandyControl.Controls
 
         public Uri Uri
         {
-            get => (Uri) GetValue(UriProperty);
+            get => (Uri)GetValue(UriProperty);
             set => SetValue(UriProperty, value);
         }
 
         private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
         {
-            var ctl = (GifImage) s;
+            var ctl = (GifImage)s;
             if (ctl.NativeImage == IntPtr.Zero) return;
 
-            var v = (Visibility) e.NewValue;
+            var v = (Visibility)e.NewValue;
             if (v != Visibility.Visible)
             {
                 ctl.StopAnimate();
@@ -204,8 +206,12 @@ namespace HandyControl.Controls
                         streamInfo = Application.GetContentStream(uri) ?? Application.GetResourceStream(uri);
                     }
                 }
+
                 if (streamInfo == null)
+                {
                     throw new FileNotFoundException("Resource not found.", uri.ToString());
+                }
+
                 CreateSourceFromStream(streamInfo.Stream);
             }
             catch
@@ -214,20 +220,36 @@ namespace HandyControl.Controls
             }
         }
 
+        private void SwitchToCommonImage()
+        {
+            if (Source == null && Uri != null)
+            {
+                SetCurrentValue(SourceProperty, new BitmapImage(Uri));
+            }
+        }
+
         [ResourceExposure(ResourceScope.None)]
         [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         internal static void EnsureSave(GifImage image, string filename, Stream dataStream)
         {
-            if (!image.RawGuid.Equals(GifGuid)) return;
-            var animatedGif = false;
+            if (!image.RawGuid.Equals(GifGuid) && !image.RawGuid.Equals(GifSingleFrameGuid))
+            {
+                image.SwitchToCommonImage();
+                return;
+            }
 
+            var animatedGif = false;
             var dimensions = image.FrameDimensionsList;
             if (dimensions.Select(guid => new GifFrameDimension(guid)).Contains(GifFrameDimension.Time))
             {
                 animatedGif = image.GetFrameCount(GifFrameDimension.Time) > 1;
             }
 
-            if (!animatedGif) return;
+            if (!animatedGif)
+            {
+                image.SwitchToCommonImage();
+                return;
+            }
 
             try
             {
@@ -246,8 +268,8 @@ namespace HandyControl.Controls
                         created = dataStream = File.OpenRead(filename);
                     }
 
-                    image._rawData = new byte[(int) dataStream.Length];
-                    dataStream.Read(image._rawData, 0, (int) dataStream.Length);
+                    image._rawData = new byte[(int)dataStream.Length];
+                    dataStream.Read(image._rawData, 0, (int)dataStream.Length);
                 }
                 finally
                 {
@@ -358,7 +380,7 @@ namespace HandyControl.Controls
                 {
                     for (var i = 0; i < count; i++)
                     {
-                        guids[i] = (Guid) InteropMethods.PtrToStructure((IntPtr) ((long) buffer + size * i), typeof(Guid));
+                        guids[i] = (Guid)InteropMethods.PtrToStructure((IntPtr)((long)buffer + size * i), typeof(Guid));
                     }
                 }
                 finally

From 978df93a0496256aa0562f92e8c8206f5e3cb031 Mon Sep 17 00:00:00 2001
From: "github-actions-dotnet-formatter[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 13:34:02 +0000
Subject: [PATCH 21/56] Automated dotnet-format update

---
 .../Controls/Image/GifImage.cs                   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
index 9771070f..dc8b5fae 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
@@ -41,12 +41,12 @@ namespace HandyControl.Controls
 
         private static void OnUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var ctl = (GifImage)d;
+            var ctl = (GifImage) d;
             ctl.StopAnimate();
 
             if (e.NewValue != null)
             {
-                var v = (Uri)e.NewValue;
+                var v = (Uri) e.NewValue;
                 ctl.GetGifStreamFromPack(v);
                 ctl.StartAnimate();
             }
@@ -58,16 +58,16 @@ namespace HandyControl.Controls
 
         public Uri Uri
         {
-            get => (Uri)GetValue(UriProperty);
+            get => (Uri) GetValue(UriProperty);
             set => SetValue(UriProperty, value);
         }
 
         private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
         {
-            var ctl = (GifImage)s;
+            var ctl = (GifImage) s;
             if (ctl.NativeImage == IntPtr.Zero) return;
 
-            var v = (Visibility)e.NewValue;
+            var v = (Visibility) e.NewValue;
             if (v != Visibility.Visible)
             {
                 ctl.StopAnimate();
@@ -268,8 +268,8 @@ namespace HandyControl.Controls
                         created = dataStream = File.OpenRead(filename);
                     }
 
-                    image._rawData = new byte[(int)dataStream.Length];
-                    dataStream.Read(image._rawData, 0, (int)dataStream.Length);
+                    image._rawData = new byte[(int) dataStream.Length];
+                    dataStream.Read(image._rawData, 0, (int) dataStream.Length);
                 }
                 finally
                 {
@@ -380,7 +380,7 @@ namespace HandyControl.Controls
                 {
                     for (var i = 0; i < count; i++)
                     {
-                        guids[i] = (Guid)InteropMethods.PtrToStructure((IntPtr)((long)buffer + size * i), typeof(Guid));
+                        guids[i] = (Guid) InteropMethods.PtrToStructure((IntPtr) ((long) buffer + size * i), typeof(Guid));
                     }
                 }
                 finally

From c4570caedff09c190a80de3a15a1bcf1d92c5962 Mon Sep 17 00:00:00 2001
From: GF-Huang <GF-Huang@users.noreply.github.com>
Date: Mon, 5 Apr 2021 04:06:54 +0800
Subject: [PATCH 22/56] Fix Shield ContentStringFormat not work issue.

---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 61fcfd3f..2701055e 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -9812,7 +9812,7 @@
 							<TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
 						</Border>
 						<Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
-							<ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" />
+							<ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
 						</Border>
 					</Grid>
 				</ControlTemplate>
@@ -13294,4 +13294,4 @@
 	</Style>
 	<Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
 	<Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From 08da4c5da678788c01ce1ddd457e406e1bbff16e Mon Sep 17 00:00:00 2001
From: GF-Huang <GF-Huang@users.noreply.github.com>
Date: Mon, 5 Apr 2021 04:37:11 +0800
Subject: [PATCH 23/56] Fix Shield ContentStringFormat not work issue.

---
 src/Shared/HandyControl_Shared/Themes/Theme.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 23111f0e..aca197c7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -9930,7 +9930,7 @@
 							<TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
 						</Border>
 						<Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
-							<ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" />
+                            <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
 						</Border>
 					</Grid>
 				</ControlTemplate>
@@ -13444,4 +13444,4 @@
 	</Style>
 	<Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
 	<Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From be4ac4d4c0446bc6e4d6fc34b641f02fe139e3e6 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 6 Apr 2021 20:15:07 +0800
Subject: [PATCH 24/56] update readme

---
 README-cn.md | 4 ----
 README.md    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/README-cn.md b/README-cn.md
index 83f0ff80..f56a930a 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -28,10 +28,6 @@
 
 ## 面向中国
 
-### 招聘
-
-百度地图，招WPF研发工程师，有兴趣私聊 836904362@qq.com
-
 ### 码云
 
 [https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/)
diff --git a/README.md b/README.md
index 61e3bf7b..4a73c6ce 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,6 @@
 
 ## 面向中国
 
-### 招聘
-
-百度地图，招WPF研发工程师，有兴趣私聊 836904362@qq.com
-
 ### 码云
 
 [https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/)

From a054812c725a6d1a47abb57cb7a3a15bb21a2a0c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 6 Apr 2021 21:50:13 +0800
Subject: [PATCH 25/56] move code to ShieldBaseStyle.xaml

---
 .../HandyControl_Net_40/Themes/Theme.xaml     |  10 ++++++++--
 .../Themes/Styles/Base/ShieldBaseStyle.xaml   |   2 +-
 .../HandyControl_Shared/Themes/Theme.xaml     |  12 +++++++++---
 .../Themes/XamlCombine.exe                    | Bin 13824 -> 14336 bytes
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 2701055e..1a9a5274 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -1,4 +1,10 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:converter="clr-namespace:HandyControl.Tools.Converter" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:themes="clr-namespace:HandyControl.Themes" xmlns:interactivity="clr-namespace:HandyControl.Interactivity" xmlns:hc="clr-namespace:HandyControl.Controls" xmlns:tools="clr-namespace:HandyControl.Tools" xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:ex="clr-namespace:HandyControl.Tools.Extension">
+<!--
+    This code was generated by a tool.
+
+    Changes to this file may cause incorrect behavior and will be lost if
+    the code is regenerated.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:converter="clr-namespace:HandyControl.Tools.Converter" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:themes="clr-namespace:HandyControl.Themes" xmlns:interactivity="clr-namespace:HandyControl.Interactivity" xmlns:hc="clr-namespace:HandyControl.Controls" xmlns:tools="clr-namespace:HandyControl.Tools" xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:ex="clr-namespace:HandyControl.Tools.Extension">
 	<langs:LangProvider x:Key="Langs" />
 	<converter:Boolean2BooleanReConverter x:Key="Boolean2BooleanReConverter" />
 	<converter:Boolean2VisibilityReConverter x:Key="Boolean2VisibilityReConverter" />
@@ -13294,4 +13300,4 @@
 	</Style>
 	<Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
 	<Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
index 6b2e7f73..2ba5fc6e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
@@ -27,7 +27,7 @@
                             <TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0"/>
                         </Border>
                         <Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
-                            <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}"/>
+                            <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}"/>
                         </Border>
                     </Grid>
                 </ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index aca197c7..5ade2185 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1,4 +1,10 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:converter="clr-namespace:HandyControl.Tools.Converter" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:themes="clr-namespace:HandyControl.Themes" xmlns:interactivity="clr-namespace:HandyControl.Interactivity" xmlns:hc="clr-namespace:HandyControl.Controls" xmlns:tools="clr-namespace:HandyControl.Tools" xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes" xmlns:ex="clr-namespace:HandyControl.Tools.Extension">
+<!--
+    This code was generated by a tool.
+
+    Changes to this file may cause incorrect behavior and will be lost if
+    the code is regenerated.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:converter="clr-namespace:HandyControl.Tools.Converter" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:themes="clr-namespace:HandyControl.Themes" xmlns:interactivity="clr-namespace:HandyControl.Interactivity" xmlns:hc="clr-namespace:HandyControl.Controls" xmlns:tools="clr-namespace:HandyControl.Tools" xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes" xmlns:ex="clr-namespace:HandyControl.Tools.Extension">
 	<langs:LangProvider x:Key="Langs" />
 	<converter:Boolean2BooleanReConverter x:Key="Boolean2BooleanReConverter" />
 	<converter:Boolean2VisibilityReConverter x:Key="Boolean2VisibilityReConverter" />
@@ -9930,7 +9936,7 @@
 							<TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
 						</Border>
 						<Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
-                            <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
+							<ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
 						</Border>
 					</Grid>
 				</ControlTemplate>
@@ -13444,4 +13450,4 @@
 	</Style>
 	<Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
 	<Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/XamlCombine.exe b/src/Shared/HandyControl_Shared/Themes/XamlCombine.exe
index 44f393d3a274a155aea1b77f7c8c9fb59796d235..af458ffb9aa900e4444cd340ebd96f87aa63c8bf 100644
GIT binary patch
delta 5814
zcmZ`-3v^r6l|A?B{q$rjy6;(%9m|d!fASp5i4#g<8}czBhJ-)~PC`6^mVA`pHuj4p
zJLEG&a`_CQCB>tbw$KlTRcP9>O2!P7)hUGzX@<0{Ap@BiSYVvB7=CM332V|RbZ9gC
zUdf45T4`y&bM`&=oO6HYK0CiNzw6$+X5YMh=S@`lOww!$u{NR<2)jsTR*(L0LpZsb
z=(CcziRcw$w9YNd6O}=K_e!Efp^m2ty=;!XXD+BDeyPIUtcA@hJjv#;MTH4AJGl-X
z<OlY|NvGwA@q+{rgKiNSh3A^v3fJ-m)?FCp-8nP!Cebdx8hMnPLDPq&?biUBvb8{0
z%g&MyJ)4vdBj#G|egJNSb-x=FL9Y&U=k;JjFvB@K&6Y$rh-@XKMh+Vd_I^DyzX9Od
z!tQ8<LCg)c=Uzcx!uA`{AVPkVY%jA!nLkIGdw`CUNE}2nWUFXbYQ-GbiuPKh-R;s-
znUCSx83UPkt&$x88*|IiFi$o(XmHBC`H(%#zn$|I0Nt>aiJ?V=y@gO!+}0O`J)JD2
z;9mp-VVC@&gO0(ODxe61{fz8?vGh4Z%$Vx42zn{^8UA7@P3`}IQN`Ry4kmw=@rYa~
zHBi4@`VlSH3E_7@9IC=Hx=zWfaEgPM!%WRrDalEjig{t4jvBs7Htt3ylJM9G<JR2w
zC!#_OWBHlu3O8j6*S`b}uZu`)hgnJv4>@^woF83<sF;d0ZFCjI(TPxeqZ<;T(!%<e
zqW7|@Kb<`bVhLn_DZmx&#Bx}((%|GCb)zCW9EH&Fwp{h7+6I{hxteN?Ujl22Xxv{0
z2g=Zm9at`%#YHT$3wCPlQZq$N&0vu_w^7`9%QdjubKWjDWvIC6hD|WM{hVRtl%1lc
z*@?J10<E1w6LG%_skF{l;$;w>N`bsY%rme_JRD;~=wK@S6=)O&gxuv)DlSIn8O+dM
zTMi2|Y6;6Y)VJ*KJ~?}~cpS}`Th-DDM^*kx_;F`CGd+PQhgxR|^BnD~7}BU)2CItq
zx>dl95_7`vuK>I7XYG$+ZewnB`#126yNQ@vgUQn2rTRkWqUL@d#l=p|MU21Fz6$OB
zYCx+Va}zDKq6Xn=M9rtX<uIUy_lrcTm~b)FRKnH8gsYKowWx*%U@6~ao6cf46?2a*
z>4p+>Yg=YnNU8RGx-&2r{!FCNBx=#UR@4f!INX2d`%!^3KX(;cHE#{j^h}szX}hq?
zIVRyvl#b8ixfBZar20tyDS(T%<M1%WU*=s67ydN>5B1xI8*<w?p`1uxB48WdwcuNu
zN`Ylu!&`&>Z%;LqW$wp*3uM=V+b0vLZqq1_K!_s(ndi}{%9E{~mqVF<0c|M0Ov$E_
z%lWi}rnS$67oio4h&pGw(ADwDxrQ)0K0%g3SA{5`%4W(Ey5?VpL@>v)HWy2g+5U*M
zG^bS~?8yuJS*3oKs!o~T$RpGP53MdNWf9N3K1HP(M6SqL$|MyP(w(aGL4TbLD{BiV
zS=chC<pii|*HE%D)NM1Zn_*7tW~vg`c?~uPPL)|Ka=5cl<btIlXEX&gRTMEfvL1H6
zRy=~*pBWdP3U=q@eQ5LZ(-CU_8D?YJWR#T#$OEN&Ftu_T<E=;kqV7vEBh3`q8}Icu
zfbp*flpDcf8QBcsG7v2ri=A?rrgMI~OMWHuDZl5)3;ep8fkAe`VXGx2>AEySopOdM
zN)v>gfeF%!6EtlXg}PhnOJkKgs91clc~a#7Rp9)M=Uld){LB6fzqim8YRml%EHhWi
z<TpY33hrR$;V9YaAlgRu2FQ(Z|3>-9Y?Q<PT#><fv>RjoO?Y^l0il5DZ^3iIHd9!9
zb#-NKKnH_+TcuG9z}3-9x!l_Z&G5F#il;7=)J%iNy)@L!L+HedNyt7ecIJJVpOlM7
zH)R;!c4!mjWtlH)w9CrwC@e0kNnl&B>b3ygiOpc(ba*$z$mWOoDlfXYu&XSQ3p7p8
zgc<bvz`s6W2UA#Bm8ju=0aWI{;LPy92=ObZJf(?{alM^@l;QQ`(G+vFiAbY2AbB4U
zhmJFiGQrRb#e%}k6p+bq$nHEsHIuccI!B4cQ!kl#E6Y+u8o8(~7>%?N-Y)oiDI#MJ
zLW=nrg<0T`Wc?vXb|$DJPxS`HJsV^7hCzp7W_CB8jrB4dQNwcY7O4InKx-%y*J;VF
z>|QAQkg1Dl!aXkELj_m&X399Q9F23c`+(kl0QdhEXdC{mk~vU#s(fV0B(khOK(q!O
zPX{6Q3}yNTb|68bOC7x5;w7wpeGk1ACqlwhf5rM$xb)}@^d}0#;W<&fFOY^G7KqS6
z{SFk4gqw4{8fqgx2Hh42nFhI<#2x%aV+OS#u0frF_jQB5$|d$H`40*oR``O#Csph3
z6;>!_KmTvTptk}CWiKV4;D<DWW>}J`p@X_jN38xF9$T$`;5UH=#b_Hs&IQ`^K9|g6
z#zRPG8Iv9AnY6smkbIkQP!H4F+KUJi2@b*aC$KSaUC9A31Tg5NCT(h%w0VH7h0jlP
z*|*a;32cB(&Y&SUvZ)(RZF*TH(XOvW5<d;f5xa(zEtS?ID(f$q(((r7=wV%kx!sTf
zzOTYFE}5&8yfG+cpULE!5yhZQ#(|(gcWCcg2HmSe&e4NtkPEO_0`ivM2;F0xW~-De
zmvoOVH4SM5S%g+vr`a9Q%4lu=2ij7$HvbHe(Z%{xoY4eH`6xXD`A76ier;0vy|eNd
zQe?ENsL>f_!|J0(T);#lG*_R*HCxtH)Exa+D9&q?HcE?vzvc+$$+l7Yz<imTl*c6{
zwL92r+@c}uZK?fOKgDgjRBmx-J^DL5M30xW(^@|(qj!{6Os1SZXdxM2s=wvsRGyL@
z@3cM_oWz);N*l4Z2P4pGOKq*zzmlM)Qd@`hdoE~xsqHuBAGt$|OKq>3JRr9^qkY)n
zoW2fZ^q|5o;UIBJ;V9)WPCOV%iYX&b4=ed=*!@!-Oe_%`!ICS>0KKhRufd^WG=)Jr
zW-z2Dr@9JgQ!_9^3lw%J>{7T&;aWPDLvycEHY@B?I0%f=UWFryIjB%D>3S5hfz>}|
z)KLYnmFk#f-Ac{uZFU<iV5`i#XiV9R(R%9;oudDtuY<YU`ZnaV^bpYCk5U3Q*#8a6
zG^MbPO$Lv`-Ie-rbjV@i$7ldkeu_4juTTf;(_Vx87@MTSv^#Jd@&avA@o%BmzXjh1
z6T|Y=v0o|qNmzC<m!GCp>}BnL!87ZR3N?0^{wZMR*eP00lL+$&k3haei@;r&RkB|8
zv@wgFpr2a}z&9<Ay-FTOF<~!QDOh%zZEUl$8KV}qh}E%ogG*V0zGZd+Z>K9*1Mq5=
zQgVv&`g+J8nGFARkRBRnAlSun4QSYe2HC9wquIjx*cqm=LH2lX2k;0^Mjv~g^|J-+
zsCkt3VhL=7ufw*iW8X551EcI9!Y|QNz}K}g;CIn0L5tX<NM%FtAK<fAe->5`)AMY!
zxQJ}F6{XP}`$scEqwE<S3frh3XYWxPKf%Umo%R|WS=J;1pRr{4=YsD57xUZbLoC*B
z*~dgd;*14RQa+{)*b^VqH%RA)*<BRkN7x(eStj?y49F4(*#j8T)9gl81vzcb<}a|^
zO09*Ds8y`P+O)ylF{7Q2u}Nbo(m2Uh@>jt`=#<L(Jr=Xp^7q(Y^LqXv`#<eQ{xQ~d
z8xNx#Wq}sm$LCRqVu5+&(kx&#Ed|!o6~Go+2fT>Vz)R?Rz!f<~T}3ZJ>7g2J9&Ms}
z;8vOk{GwvAv>5V!S^~U{c4#B?W%`LWrtmq14>HL-t8h{wamgeVE?3x28Md2!mHm|c
zj#cnAC~5NIi|h_s`1@j?RR(;+6oJC?QBQxIo}_0AA4c6vPQyrEoKv4KaJ;eMb0OES
zD)@!m!SQ7=iv@S2hd$rkm&pzly5fHdts2OtGeei9xBHp#C6#-PiWQmk=ArZozrQ~{
zFhm>scS0OLQrp7{dU7H+QfE`L^j$|cQy*oaZ6zPqQ5w=Mv{^Abpbg-cfj)%iHneR)
z{YXMjg7NX)N%L_3o%go_{x+kR>?^%WD~VH4wo_jYon)AP7)obb@f?P+<oeK6CX&H7
z4QUA67D&?RZnVl48Gb+|a|@WA_!e!FkbL-&efsbkc0MT?UV1MMvA!5cW+#JudXyN^
z_^ITh0YMA@{)xMfey?!(6aW0t{3CBY@J`{I4YfV@u&|!wEK#XPovT^cPBIpC^7k;8
zE;nb@gq^j{dZ#z)+{nUFXEP6rh?J+$3Onm9Cyhs%JAF>t>Bn!dU^aT&2Ax4Y$(-J>
zmLzA;N^%DbIOWPL`7(;mu+2E^6p*uCN00n>Wbd>UND}gc6xNCJFc58HMv{e{{NX~b
zG2WaGhr`ejI4wi<p+^Egj-RDG9Wjf+3%_WbpL-gy!r_34{-%wdVWd5XA*$pt5nzOg
z^e|q@p}k)w#KV?VnwsY@HSk;Gl4%CQ&akr=r$Xi>@<)*e6Zsb{;?6J<d;ys=XV{=X
zIGjk}!Ip)?+`x2)oxQfHJGa7re#F9|aBhW9kv{=n^3<_}W+E4hn3I1)<WFJ#Y7!6&
zKWeI~I8lx`9LAc-YIHRtzbpJ_)4eEeFdrH3pYv;$n)+Wd$3aXm9L81n;mzW@p38d{
zGVzQ28}}_gyx%w+n7DRmd|R`{oGVwWQ>$Q$l#`=%F}`l~_<eKtu)<5tYsSN=KbU-|
Nb6kAp12)=b{y%eT#pwV5

delta 5432
zcmZ`-3vgA{x&GHW`+btlS$iiZuM<cJBs-jw5KwE9N&%}pR46e<!B<U-k6aC#oIn+*
z?xZp(m0`@BwvLQiVu$uBW4%uB-s_-TZRx{wWOPbvsW!;;dhghJRVq^-(<}Yf+UG#1
z_ipBV`~Uy-zt+Fj`qvI48%OSV@c!9fd;it1Qt^3<W>b=N5Y2<YiG_z&j6Hd^d&df*
zuSmg7L`RLWM!#%?s0{r1%ZW0DMxHCIV=d0%0HOx`<`urpvMg8lSJuMLFHEu74SV51
zKJvv$r-~dj>xdY5i^wPpWjhLM_#D<+*vywj!x(bPhciH58?KixJ?)#Fg9+#gbB}Kc
zE0_s!cON9e${#1%7|xP{OCT7o1~r#MM}vOY04{6<__naSnxK&OozA0(E$nbM<iZJ?
z<Z#jw$#4!)<b-p<cl`$0LDCG`iWSwc6ShF2!~v%4bZwWel3^?8{2!4?fC@TY8z4>l
zWf;iHf%h@sl?9l%6SPTa2l(Yy{zD9i@?bt#6}Ih_NZ8Y*#S}s;jU()$KUnCPoT&ne
za!40Q2MeWBSGXmc^S~E#cf<3+G<Uv^S*86M(D;XhN9AJ3d1C$-NI$9Ul_C{>0puoB
zl=-6QRfu@<a+<mMDkW6SDaAZDPobu-lCAP*Of|scg-~wWH&rQ8n`@<CPk1>~cwr~x
zZ;BahQI}cF4lh|eyw1+f7k(+ywAuOb?1WRb*2jVtS2pZ|_2Qb(PM?OL8+7<ZfS>C8
zOfGG4ZgL;`6{2EuC5W#7#QaHA$bI1C8N+I-H9i6ZQ&d!i7eTHx{mOe5NoQ$MnO_Ax
zwRpK&QK_~{EIPAM{B(9T^!h%pr$p2BnnhHZ??0nhU2>>I(-cKo9f7t^TcpD;A(OUt
zNi7EDRS9GzDgy&sB)~~Ega%1fxCDbj2eDKV@k(_673Dc+F`{X!VWOU<Fpb><i+BF*
z^y&C88fm{e+YLw6;l*&|*LXF7K$P8WvxIR*90!p~UzX9TtJe9|z_k*E9$o_B!h@Yp
zp|EMcw(}vptNgmOpUFn6k*+Rk&vh;`d%{a$lbeSa|Ihd`jEBnsZRi(u*_k4Pa2b*L
zytmy03-^e+T%2zlsg!SR6enDZglk1DJOGOcFTU<H_EMaDdeJg4X}>-@%R)-^XVaa5
zT7=lzPP3?odA+C?Mm*o&@@?opT8KvIXu(RL8JN(PJ$EV2C&&A6gw7$`auYc0N%hEq
zM*sq2Pr*e=esORaoP?JHf-3;hk>9}yjX*jR3C9RlLEhFpEwZ5^mqyC+cVf3ChF3#v
ztIQ;->(FQffe=R|^5Ym)?a9&3(#iZjhz%t#Q?#k*az5>xX`Qw3BDA=NsB@+ZJw82#
zFuMMRBvDM+hZ3r3<}9IWVT8-ZLB(d{6?Y=D^M_K^oYstR1)OVWX`!;SRCCHdAy3d6
zcxdyXDSLSSxsoV1rzo<NMy^swZ&Jsy!ycS}CzP!PGSvlMkp)0qoHKTYx@@M|87AyX
zW~S<J-K()XaIVa_$>Hw7v9gOz&PZsgC89R68+QLbK7*RlRTovPT==!UERwgO!_Sr@
z*?ADvm{yFk;slS&3Ce3Qcj+`qa3v%$A4)PW)s%2u)w-}3lJF`(xnaj`q#uOrBH6XE
zQIt>clHX-Tzf$r!zh{K!`1Lg$*VwZqDe1acp>A2BieiDVGcad8F3_}HlytI9#ktlM
z8k1FX`_4FM`_2DtZG=}BZb)`S*FZBrSEjla)Gl01EWp8Wiras99q74L;kELWzd%m%
zx>$0(e5J!1@Ct4OBok(c6X{GjW)4fOE~<PN3=AIJB$d(tt`1tx=RrR>Bj}Ihh`c>=
zwFa*Wz6L5E!HCC6NSmya|Aov?((ysf8AkARa8u=F`P&k-(HdS4ZtFaTuOUvClYLd`
z<BaIgAu7k$5v%J+&?vTqfin`^40VU^9;iN#brg1$Wg^oKZ-MO1DaX!XX;tz@cq>Ht
zpCEt{-Uf0PHhi%-GM8WgkTZgR!mBy$Yg4JY!R=Ch2cQZ(PPJ?`4AbLOM{X;jjm31;
z!m}A}*g#QArs$)kAPcD_f<ZWWH6^V#fJ%p<!i~U9QW_3{a`OKrlT+VKJa90%AP;de
zZ4M9PJ-11QBbu`$*aSA*3}{Q{Pr+vR8=$u$J0E4qQX9!nOu^M{nKRU-J#Y9<=md8G
zc(?`V7~xha*;e>t`RJlwBFm<G@O=xz=WWovoALu2Zbe+84{*_K*C6ZbrA;Um5~il*
zeJgRD(RT2U6vo|_O5Dc;CAlKx6@S|be{fr)MH*Tn9)oU8yl)uvk;2RQGsX;>fw%_E
zOdQb-8s-ugDSArbeF~paxJQk?q3~mcU*)gD+b<J?(n`_K^1Noyho+R&)1dCqH?5us
zujN(`L}^-&VDo?u9pO?kX6!Hx>R?i}g7pBm8d6?i4C*dTYR@3R8`fGl{U7KUG@Hu_
zFt|48IZf)gOzP}nJ@EOKE^TKT&jIHsowe{2IW!MW9ePY9k<ojQ#J#qh>qm;VR9Zh&
z`QBnm%_YjweYy;Dn;`>yPlf-B!iy9(*>dzICX*{i7=soYD{X@Yv<b_gO}eDFLyq1~
zgpP}csedUNGET6Sik6Fcy)HQoTgGN7YPC+VQE+9{GqOtySkK7gKt?tCUe0KWB>gk`
z5$OH2pRZ|<es@&wS5?^<bM!Vl1@CX-FABmTja+>a_v!~l_OII0JV71Ja&U~8eSmB9
zK}*d2+I*gyv>vyk9Qy|QDYs~?Japh5)F-(^DSRAD?n3=lo}}$X?x=PRE2D#oi<2p*
zpO(1D_$@D|6ESPG+LM^`JBk~%7T76pe<_X$>p2qiX>qLHI?e?p@aGF=X#I=%Huos0
zxKZl`^H1PpMQ_L6=ClLIXiVWPI6|C00w$;mM+x6HQpA)Jrwxj}3;Vug@MjzwMwddB
zE6oH=s?mi?UP7Dp8w}~mQr7?-Y6Yfffx<3@OBJqE*rRYA?T?_;ub2UaL%>SfqHt76
zb}F=)bUg;z!0PWe8mR)<Mm6kRa~n0X*Rd~JS(~|o#+A-Eby>UU7=1_u$|%Vkg*k;a
zY`^_9Y;$^a00t4tJWf}lz{jZDJVXoFD(x`n$Jiu2LDwb@fUeXgmHY_I9<`4`a>AMf
zJ*Ma%L9>f}#C}gp*}rLTLH@S+-wNM@hrNkY&|gB6i1KazDd<@mYQs(wk5~_T)Uesh
zbid^SpR_#o8kKQ_df0cYG&@E!&04lj>5Nl`HLw~sVF$Q<?l!Z)?Qk;(cp=LvI!EjE
z#h~9b8RbZNm_uE57Pwx&6mn@*fyrFK`q|s;J&Fd{HoJ!nu<zm=^s{H#HLR6AVLnYm
zD7eh}T`Pro+-)8J8f+Nh8}&5sMePCLw_uf_7B+@d8tq5ml<QBjQT7A+G25w@Y$r3U
zO4`XDHdDaIbxB{OA7Ce_f*)k#5p`;Z;pkm+5`q82lHqsRuL0}$D7}N#`W-t-zp~z8
zpU_dXj+4}l9dME!qW9Q1yPr<6C)g48B$GSfW6%-@*e#gSGi){Ee1NSqll&#ts#U<B
zTtvAvHT)BJZsZTM=&;ekUuHjN?ff<5o1$YX>l5r#vzwn_H<(NKJM6f&jGx51uHr75
z&-FlyBHm6(`V8oknP|tI+YD@?`M@k)1U!#c0l!H10l%yym(#z4?j>Dor|T#Q{CY%b
zylz*bVQh<b+D3DM_tICiQF?$L(#93Oq;M~jk{1=erI5IkG$>r6u#>K5H?b}3adw>j
zFS`H@OkQwH?GNzh$Bou0;7jHwoKrbE0HZ=G-O#&-_R>F-HX=`Y{KE^+39$0kEIqv(
z-(z^rmG$VKmkmzbo3>bCPu0g0-><&Yn3z9nH7k6x;rPTov-c&ULqFf~#_N5#i=SEA
zyRH54otKf;z?hY2Af|&5Lb9#|Zd7_BJDICDaF(goE4@|Bbs$$#pDs3M*1KMh*H`JS
zV{WB)19wGA(j~N9ug~)O@#^Q^&0fDZfZt$YUvsc#&>Mt5n3+X8gp!6R7niXmkk_XJ
zMjl35@PY)92`E=5&RrnJ9yJ=6>y7LyENH1}?RQ-lJc9H~>ziSb!H?r-DNj$C4ctTM
z!cfcn=vl;a-Gm8y(}AUn6bHS&I8jU)5@8}eBq?PWACL)g*RqO5c!Bu@zxCLHX2SJ`
zyv_I%QRXE^UP2yBjJ#|S_lA(*&yYFuh73x$ZYF~l`;zN&1BG?H&9<p~Tj2k03rp*5
zflD#+3S7y}!!nwQR4iiN$T2bU2djbCXFwKi3~DM~DMuI%WzA&ux+=)Y!UMsBAendf
zL}Tl(Sg!P+njG6CgB`VIIexfBuk5{~_rOlEapq6PR`0v^)`PnjUobIIowb<zofUFN
k#m|pd6xwsOeD8{h%W`+I3Ag=IlfT$GA-?cF8|yIt4y5IDP5=M^


From 3a0d3046ebd0f35894ddfeff4dc8b878b009ff64 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 16:00:40 +0800
Subject: [PATCH 26/56] Update build.yml

---
 .github/workflows/build.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77420a4b..a5c609a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,11 +6,8 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - name: Checkout
+      - name: checkout
         uses: actions/checkout@master
       
-      - name: Build Net_40
-        run: dotnet build src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj -p:Configuration=Release-Net40
-
-      - name: Build Net_GE45
-        run: dotnet build src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release
+      - name: build
+        run: powershell build/build.ps1

From 59e3c180901b38a3cb5928864717eefbfd7c7f2b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 16:00:40 +0800
Subject: [PATCH 27/56] Update build.yml

---
 .github/workflows/build.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77420a4b..a72e9941 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,11 +6,10 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - name: Checkout
+      - name: checkout
         uses: actions/checkout@master
       
-      - name: Build Net_40
-        run: dotnet build src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj -p:Configuration=Release-Net40
-
-      - name: Build Net_GE45
-        run: dotnet build src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release
+      - name: build
+        run: |
+          cd build
+          powershell build/build.ps1

From a8c8859a959f131f7646887a4150fbf03cf15a55 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 16:17:38 +0800
Subject: [PATCH 28/56] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a72e9941..0a16fb49 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,4 +12,4 @@ jobs:
       - name: build
         run: |
           cd build
-          powershell build/build.ps1
+          powershell .\build.ps1

From 152af04a43231c4f143a06b37e508763986243c0 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 16:58:57 +0800
Subject: [PATCH 29/56] add build-for-myget.nuspec

---
 .gitignore                   |   1 +
 build/build-for-myget.nuspec | 210 +++++++++++++++++++++++++++++++++++
 2 files changed, 211 insertions(+)
 create mode 100644 build/build-for-myget.nuspec

diff --git a/.gitignore b/.gitignore
index 73a63a6b..9b3fa82f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ packages/
 build/*
 !build/build.cake
 !build/build.nuspec
+!build/build-for-myget.nuspec
 !build/build.ps1
 !build/tools/
 build/tools/*
diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
new file mode 100644
index 00000000..eb486ee9
--- /dev/null
+++ b/build/build-for-myget.nuspec
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>HandyControl</id>
+    <version>3.1.0.105401</version>
+    <title>HandyOrg</title>
+    <authors>HandyOrg</authors>
+    <owners>HandyOrg</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="file">LICENSE</license>
+    <icon>icon.png</icon>
+    <projectUrl>https://github.com/NaBian/HandyControl</projectUrl>
+    <description>Contains some simple and commonly used WPF controls</description>
+    <copyright>Copyright © HandyOrg 2018-2021</copyright>
+    <tags>WPF C# Control</tags>
+    <dependencies>
+      <group targetFramework=".NETFramework4.0" />
+      <group targetFramework=".NETFramework4.5" />
+      <group targetFramework=".NETFramework4.5.1" />
+      <group targetFramework=".NETFramework4.5.2" />
+      <group targetFramework=".NETFramework4.6" />
+      <group targetFramework=".NETFramework4.6.1" />
+      <group targetFramework=".NETFramework4.6.2" />
+      <group targetFramework=".NETFramework4.7" />
+      <group targetFramework=".NETFramework4.7.1" />
+      <group targetFramework=".NETFramework4.7.2" />
+      <group targetFramework=".NETFramework4.8" />
+      <group targetFramework=".NETCoreApp3.0" />
+      <group targetFramework=".NETCoreApp3.1" />
+      <group targetFramework="net5.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="lib\net40\ca-ES\HandyControl.resources.dll" target="lib\net40\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net40\en\HandyControl.resources.dll" target="lib\net40\en\HandyControl.resources.dll" />
+    <file src="lib\net40\fa\HandyControl.resources.dll" target="lib\net40\fa\HandyControl.resources.dll" />
+    <file src="lib\net40\fr\HandyControl.resources.dll" target="lib\net40\fr\HandyControl.resources.dll" />
+    <file src="lib\net40\ko-KR\HandyControl.resources.dll" target="lib\net40\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net40\pl\HandyControl.resources.dll" target="lib\net40\pl\HandyControl.resources.dll" />
+    <file src="lib\net40\pt-BR\HandyControl.resources.dll" target="lib\net40\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net40\ru\HandyControl.resources.dll" target="lib\net40\ru\HandyControl.resources.dll" />
+    <file src="lib\net40\tr\HandyControl.resources.dll" target="lib\net40\tr\HandyControl.resources.dll" />
+    <file src="lib\net40\HandyControl.dll" target="lib\net40\HandyControl.dll" />
+    <file src="lib\net40\HandyControl.pdb" target="lib\net40\HandyControl.pdb" />
+    <file src="lib\net40\HandyControl.xml" target="lib\net40\HandyControl.xml" />
+    <file src="lib\net45\ca-ES\HandyControl.resources.dll" target="lib\net45\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net45\en\HandyControl.resources.dll" target="lib\net45\en\HandyControl.resources.dll" />
+    <file src="lib\net45\fa\HandyControl.resources.dll" target="lib\net45\fa\HandyControl.resources.dll" />
+    <file src="lib\net45\fr\HandyControl.resources.dll" target="lib\net45\fr\HandyControl.resources.dll" />
+    <file src="lib\net45\ko-KR\HandyControl.resources.dll" target="lib\net45\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net45\pl\HandyControl.resources.dll" target="lib\net45\pl\HandyControl.resources.dll" />
+    <file src="lib\net45\pt-BR\HandyControl.resources.dll" target="lib\net45\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net45\ru\HandyControl.resources.dll" target="lib\net45\ru\HandyControl.resources.dll" />
+    <file src="lib\net45\tr\HandyControl.resources.dll" target="lib\net45\tr\HandyControl.resources.dll" />
+    <file src="lib\net45\HandyControl.dll" target="lib\net45\HandyControl.dll" />
+    <file src="lib\net45\HandyControl.pdb" target="lib\net45\HandyControl.pdb" />
+    <file src="lib\net45\HandyControl.xml" target="lib\net45\HandyControl.xml" />
+    <file src="lib\net451\ca-ES\HandyControl.resources.dll" target="lib\net451\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net451\en\HandyControl.resources.dll" target="lib\net451\en\HandyControl.resources.dll" />
+    <file src="lib\net451\fa\HandyControl.resources.dll" target="lib\net451\fa\HandyControl.resources.dll" />
+    <file src="lib\net451\fr\HandyControl.resources.dll" target="lib\net451\fr\HandyControl.resources.dll" />
+    <file src="lib\net451\ko-KR\HandyControl.resources.dll" target="lib\net451\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net451\pl\HandyControl.resources.dll" target="lib\net451\pl\HandyControl.resources.dll" />
+    <file src="lib\net451\pt-BR\HandyControl.resources.dll" target="lib\net451\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net451\ru\HandyControl.resources.dll" target="lib\net451\ru\HandyControl.resources.dll" />
+    <file src="lib\net451\tr\HandyControl.resources.dll" target="lib\net451\tr\HandyControl.resources.dll" />
+    <file src="lib\net451\HandyControl.dll" target="lib\net451\HandyControl.dll" />
+    <file src="lib\net451\HandyControl.pdb" target="lib\net451\HandyControl.pdb" />
+    <file src="lib\net451\HandyControl.xml" target="lib\net451\HandyControl.xml" />
+    <file src="lib\net452\ca-ES\HandyControl.resources.dll" target="lib\net452\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net452\en\HandyControl.resources.dll" target="lib\net452\en\HandyControl.resources.dll" />
+    <file src="lib\net452\fa\HandyControl.resources.dll" target="lib\net452\fa\HandyControl.resources.dll" />
+    <file src="lib\net452\fr\HandyControl.resources.dll" target="lib\net452\fr\HandyControl.resources.dll" />
+    <file src="lib\net452\ko-KR\HandyControl.resources.dll" target="lib\net452\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net452\pl\HandyControl.resources.dll" target="lib\net452\pl\HandyControl.resources.dll" />
+    <file src="lib\net452\pt-BR\HandyControl.resources.dll" target="lib\net452\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net452\ru\HandyControl.resources.dll" target="lib\net452\ru\HandyControl.resources.dll" />
+    <file src="lib\net452\tr\HandyControl.resources.dll" target="lib\net452\tr\HandyControl.resources.dll" />
+    <file src="lib\net452\HandyControl.dll" target="lib\net452\HandyControl.dll" />
+    <file src="lib\net452\HandyControl.pdb" target="lib\net452\HandyControl.pdb" />
+    <file src="lib\net452\HandyControl.xml" target="lib\net452\HandyControl.xml" />
+    <file src="lib\net46\ca-ES\HandyControl.resources.dll" target="lib\net46\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net46\en\HandyControl.resources.dll" target="lib\net46\en\HandyControl.resources.dll" />
+    <file src="lib\net46\fa\HandyControl.resources.dll" target="lib\net46\fa\HandyControl.resources.dll" />
+    <file src="lib\net46\fr\HandyControl.resources.dll" target="lib\net46\fr\HandyControl.resources.dll" />
+    <file src="lib\net46\ko-KR\HandyControl.resources.dll" target="lib\net46\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net46\pl\HandyControl.resources.dll" target="lib\net46\pl\HandyControl.resources.dll" />
+    <file src="lib\net46\pt-BR\HandyControl.resources.dll" target="lib\net46\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net46\ru\HandyControl.resources.dll" target="lib\net46\ru\HandyControl.resources.dll" />
+    <file src="lib\net46\tr\HandyControl.resources.dll" target="lib\net46\tr\HandyControl.resources.dll" />
+    <file src="lib\net46\HandyControl.dll" target="lib\net46\HandyControl.dll" />
+    <file src="lib\net46\HandyControl.pdb" target="lib\net46\HandyControl.pdb" />
+    <file src="lib\net46\HandyControl.xml" target="lib\net46\HandyControl.xml" />
+    <file src="lib\net461\ca-ES\HandyControl.resources.dll" target="lib\net461\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net461\en\HandyControl.resources.dll" target="lib\net461\en\HandyControl.resources.dll" />
+    <file src="lib\net461\fa\HandyControl.resources.dll" target="lib\net461\fa\HandyControl.resources.dll" />
+    <file src="lib\net461\fr\HandyControl.resources.dll" target="lib\net461\fr\HandyControl.resources.dll" />
+    <file src="lib\net461\ko-KR\HandyControl.resources.dll" target="lib\net461\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net461\pl\HandyControl.resources.dll" target="lib\net461\pl\HandyControl.resources.dll" />
+    <file src="lib\net461\pt-BR\HandyControl.resources.dll" target="lib\net461\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net461\ru\HandyControl.resources.dll" target="lib\net461\ru\HandyControl.resources.dll" />
+    <file src="lib\net461\tr\HandyControl.resources.dll" target="lib\net461\tr\HandyControl.resources.dll" />
+    <file src="lib\net461\HandyControl.dll" target="lib\net461\HandyControl.dll" />
+    <file src="lib\net461\HandyControl.pdb" target="lib\net461\HandyControl.pdb" />
+    <file src="lib\net461\HandyControl.xml" target="lib\net461\HandyControl.xml" />
+    <file src="lib\net462\ca-ES\HandyControl.resources.dll" target="lib\net462\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net462\en\HandyControl.resources.dll" target="lib\net462\en\HandyControl.resources.dll" />
+    <file src="lib\net462\fa\HandyControl.resources.dll" target="lib\net462\fa\HandyControl.resources.dll" />
+    <file src="lib\net462\fr\HandyControl.resources.dll" target="lib\net462\fr\HandyControl.resources.dll" />
+    <file src="lib\net462\ko-KR\HandyControl.resources.dll" target="lib\net462\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net462\pl\HandyControl.resources.dll" target="lib\net462\pl\HandyControl.resources.dll" />
+    <file src="lib\net462\pt-BR\HandyControl.resources.dll" target="lib\net462\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net462\ru\HandyControl.resources.dll" target="lib\net462\ru\HandyControl.resources.dll" />
+    <file src="lib\net462\tr\HandyControl.resources.dll" target="lib\net462\tr\HandyControl.resources.dll" />
+    <file src="lib\net462\HandyControl.dll" target="lib\net462\HandyControl.dll" />
+    <file src="lib\net462\HandyControl.pdb" target="lib\net462\HandyControl.pdb" />
+    <file src="lib\net462\HandyControl.xml" target="lib\net462\HandyControl.xml" />
+    <file src="lib\net47\ca-ES\HandyControl.resources.dll" target="lib\net47\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net47\en\HandyControl.resources.dll" target="lib\net47\en\HandyControl.resources.dll" />
+    <file src="lib\net47\fa\HandyControl.resources.dll" target="lib\net47\fa\HandyControl.resources.dll" />
+    <file src="lib\net47\fr\HandyControl.resources.dll" target="lib\net47\fr\HandyControl.resources.dll" />
+    <file src="lib\net47\ko-KR\HandyControl.resources.dll" target="lib\net47\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net47\pl\HandyControl.resources.dll" target="lib\net47\pl\HandyControl.resources.dll" />
+    <file src="lib\net47\pt-BR\HandyControl.resources.dll" target="lib\net47\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net47\ru\HandyControl.resources.dll" target="lib\net47\ru\HandyControl.resources.dll" />
+    <file src="lib\net47\tr\HandyControl.resources.dll" target="lib\net47\tr\HandyControl.resources.dll" />
+    <file src="lib\net47\HandyControl.dll" target="lib\net47\HandyControl.dll" />
+    <file src="lib\net47\HandyControl.pdb" target="lib\net47\HandyControl.pdb" />
+    <file src="lib\net47\HandyControl.xml" target="lib\net47\HandyControl.xml" />
+    <file src="lib\net471\ca-ES\HandyControl.resources.dll" target="lib\net471\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net471\en\HandyControl.resources.dll" target="lib\net471\en\HandyControl.resources.dll" />
+    <file src="lib\net471\fa\HandyControl.resources.dll" target="lib\net471\fa\HandyControl.resources.dll" />
+    <file src="lib\net471\fr\HandyControl.resources.dll" target="lib\net471\fr\HandyControl.resources.dll" />
+    <file src="lib\net471\ko-KR\HandyControl.resources.dll" target="lib\net471\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net471\pl\HandyControl.resources.dll" target="lib\net471\pl\HandyControl.resources.dll" />
+    <file src="lib\net471\pt-BR\HandyControl.resources.dll" target="lib\net471\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net471\ru\HandyControl.resources.dll" target="lib\net471\ru\HandyControl.resources.dll" />
+    <file src="lib\net471\tr\HandyControl.resources.dll" target="lib\net471\tr\HandyControl.resources.dll" />
+    <file src="lib\net471\HandyControl.dll" target="lib\net471\HandyControl.dll" />
+    <file src="lib\net471\HandyControl.pdb" target="lib\net471\HandyControl.pdb" />
+    <file src="lib\net471\HandyControl.xml" target="lib\net471\HandyControl.xml" />
+    <file src="lib\net472\ca-ES\HandyControl.resources.dll" target="lib\net472\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net472\en\HandyControl.resources.dll" target="lib\net472\en\HandyControl.resources.dll" />
+    <file src="lib\net472\fa\HandyControl.resources.dll" target="lib\net472\fa\HandyControl.resources.dll" />
+    <file src="lib\net472\fr\HandyControl.resources.dll" target="lib\net472\fr\HandyControl.resources.dll" />
+    <file src="lib\net472\ko-KR\HandyControl.resources.dll" target="lib\net472\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net472\pl\HandyControl.resources.dll" target="lib\net472\pl\HandyControl.resources.dll" />
+    <file src="lib\net472\pt-BR\HandyControl.resources.dll" target="lib\net472\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net472\ru\HandyControl.resources.dll" target="lib\net472\ru\HandyControl.resources.dll" />
+    <file src="lib\net472\tr\HandyControl.resources.dll" target="lib\net472\tr\HandyControl.resources.dll" />
+    <file src="lib\net472\HandyControl.dll" target="lib\net472\HandyControl.dll" />
+    <file src="lib\net472\HandyControl.pdb" target="lib\net472\HandyControl.pdb" />
+    <file src="lib\net472\HandyControl.xml" target="lib\net472\HandyControl.xml" />
+    <file src="lib\net48\ca-ES\HandyControl.resources.dll" target="lib\net48\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net48\en\HandyControl.resources.dll" target="lib\net48\en\HandyControl.resources.dll" />
+    <file src="lib\net48\fa\HandyControl.resources.dll" target="lib\net48\fa\HandyControl.resources.dll" />
+    <file src="lib\net48\fr\HandyControl.resources.dll" target="lib\net48\fr\HandyControl.resources.dll" />
+    <file src="lib\net48\ko-KR\HandyControl.resources.dll" target="lib\net48\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net48\pl\HandyControl.resources.dll" target="lib\net48\pl\HandyControl.resources.dll" />
+    <file src="lib\net48\pt-BR\HandyControl.resources.dll" target="lib\net48\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net48\ru\HandyControl.resources.dll" target="lib\net48\ru\HandyControl.resources.dll" />
+    <file src="lib\net48\tr\HandyControl.resources.dll" target="lib\net48\tr\HandyControl.resources.dll" />
+    <file src="lib\net48\HandyControl.dll" target="lib\net48\HandyControl.dll" />
+    <file src="lib\net48\HandyControl.pdb" target="lib\net48\HandyControl.pdb" />
+    <file src="lib\net48\HandyControl.xml" target="lib\net48\HandyControl.xml" />
+    <file src="lib\net5.0\ca-ES\HandyControl.resources.dll" target="lib\net5.0\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net5.0\en\HandyControl.resources.dll" target="lib\net5.0\en\HandyControl.resources.dll" />
+    <file src="lib\net5.0\fa\HandyControl.resources.dll" target="lib\net5.0\fa\HandyControl.resources.dll" />
+    <file src="lib\net5.0\fr\HandyControl.resources.dll" target="lib\net5.0\fr\HandyControl.resources.dll" />
+    <file src="lib\net5.0\ko-KR\HandyControl.resources.dll" target="lib\net5.0\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net5.0\pl\HandyControl.resources.dll" target="lib\net5.0\pl\HandyControl.resources.dll" />
+    <file src="lib\net5.0\pt-BR\HandyControl.resources.dll" target="lib\net5.0\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net5.0\ref\HandyControl.dll" target="lib\net5.0\ref\HandyControl.dll" />
+    <file src="lib\net5.0\ru\HandyControl.resources.dll" target="lib\net5.0\ru\HandyControl.resources.dll" />
+    <file src="lib\net5.0\tr\HandyControl.resources.dll" target="lib\net5.0\tr\HandyControl.resources.dll" />
+    <file src="lib\net5.0\HandyControl.deps.json" target="lib\net5.0\HandyControl.deps.json" />
+    <file src="lib\net5.0\HandyControl.dll" target="lib\net5.0\HandyControl.dll" />
+    <file src="lib\net5.0\HandyControl.pdb" target="lib\net5.0\HandyControl.pdb" />
+    <file src="lib\net5.0\HandyControl.xml" target="lib\net5.0\HandyControl.xml" />
+    <file src="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\en\HandyControl.resources.dll" target="lib\netcoreapp3.0\en\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\fa\HandyControl.resources.dll" target="lib\netcoreapp3.0\fa\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\fr\HandyControl.resources.dll" target="lib\netcoreapp3.0\fr\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\ko-KR\HandyControl.resources.dll" target="lib\netcoreapp3.0\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\pl\HandyControl.resources.dll" target="lib\netcoreapp3.0\pl\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\pt-BR\HandyControl.resources.dll" target="lib\netcoreapp3.0\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\ru\HandyControl.resources.dll" target="lib\netcoreapp3.0\ru\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\tr\HandyControl.resources.dll" target="lib\netcoreapp3.0\tr\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\HandyControl.deps.json" target="lib\netcoreapp3.0\HandyControl.deps.json" />
+    <file src="lib\netcoreapp3.0\HandyControl.dll" target="lib\netcoreapp3.0\HandyControl.dll" />
+    <file src="lib\netcoreapp3.0\HandyControl.pdb" target="lib\netcoreapp3.0\HandyControl.pdb" />
+    <file src="lib\netcoreapp3.0\HandyControl.xml" target="lib\netcoreapp3.0\HandyControl.xml" />
+    <file src="lib\netcoreapp3.1\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.1\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\en\HandyControl.resources.dll" target="lib\netcoreapp3.1\en\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\fa\HandyControl.resources.dll" target="lib\netcoreapp3.1\fa\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\fr\HandyControl.resources.dll" target="lib\netcoreapp3.1\fr\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\ko-KR\HandyControl.resources.dll" target="lib\netcoreapp3.1\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\pl\HandyControl.resources.dll" target="lib\netcoreapp3.1\pl\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\pt-BR\HandyControl.resources.dll" target="lib\netcoreapp3.1\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\ru\HandyControl.resources.dll" target="lib\netcoreapp3.1\ru\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\tr\HandyControl.resources.dll" target="lib\netcoreapp3.1\tr\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\HandyControl.deps.json" target="lib\netcoreapp3.1\HandyControl.deps.json" />
+    <file src="lib\netcoreapp3.1\HandyControl.dll" target="lib\netcoreapp3.1\HandyControl.dll" />
+    <file src="lib\netcoreapp3.1\HandyControl.pdb" target="lib\netcoreapp3.1\HandyControl.pdb" />
+    <file src="lib\netcoreapp3.1\HandyControl.xml" target="lib\netcoreapp3.1\HandyControl.xml" />
+    <file src="tools\VisualStudioToolsManifest.xml" target="tools\VisualStudioToolsManifest.xml" />
+    <file src="icon.png" target="icon.png" />
+    <file src="LICENSE" target="LICENSE" />
+  </files>
+</package>
\ No newline at end of file

From 7d1a0eb00c679704eaf1cae98ed2372605e16bb9 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:00:22 +0800
Subject: [PATCH 30/56] Update build.yml

---
 .github/workflows/build.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0a16fb49..eebde414 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,8 +8,14 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@master
-      
+  
       - name: build
+        shell: pwsh
         run: |
           cd build
-          powershell .\build.ps1
+          .\build.ps1
+          tools\nuget pack build build-for-myget.nuspec
+          $nupkgName = @(gci *.nupkg)[0].Name
+          $mygetSourcePath = "https://www.myget.org/F/handycontrol"
+          tools\nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath
+          tools\nuget push $nupkgName -Source $mygetSourcePath

From e1fa1568af52619ce0f998c681c2c5474e320621 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:08:40 +0800
Subject: [PATCH 31/56] Update build.yml

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eebde414..d50b4676 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,10 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@master
-  
+        
+      - name: setup nuget.exe
+        uses: NuGet/setup-nuget@master
+      
       - name: build
         shell: pwsh
         run: |

From 8b81d1a4aae009d3b9443790580348c64f8bbe0c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:09:06 +0800
Subject: [PATCH 32/56] Update build.yml

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d50b4676..cd340f93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,8 +17,8 @@ jobs:
         run: |
           cd build
           .\build.ps1
-          tools\nuget pack build build-for-myget.nuspec
+          nuget pack build build-for-myget.nuspec
           $nupkgName = @(gci *.nupkg)[0].Name
           $mygetSourcePath = "https://www.myget.org/F/handycontrol"
-          tools\nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath
-          tools\nuget push $nupkgName -Source $mygetSourcePath
+          nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath
+          nuget push $nupkgName -Source $mygetSourcePath

From 11b6f859afcbc8044fb139845779d4ea337866da Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:11:13 +0800
Subject: [PATCH 33/56] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cd340f93..fcdcc4cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
         uses: actions/checkout@master
         
       - name: setup nuget.exe
-        uses: NuGet/setup-nuget@master
+        uses: NuGet/setup-nuget@v1.0.5
       
       - name: build
         shell: pwsh

From b3db675dfe3167896502b9ea8b5364532f9b6760 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:17:17 +0800
Subject: [PATCH 34/56] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fcdcc4cb..7cbc1bb6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         run: |
           cd build
           .\build.ps1
-          nuget pack build build-for-myget.nuspec
+          nuget pack build-for-myget.nuspec
           $nupkgName = @(gci *.nupkg)[0].Name
           $mygetSourcePath = "https://www.myget.org/F/handycontrol"
           nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath

From bda0562150e32d358748426b509c2af9df5a6d46 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:36:31 +0800
Subject: [PATCH 35/56] Update build.yml

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7cbc1bb6..5fd2bde4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,6 +11,9 @@ jobs:
         
       - name: setup nuget.exe
         uses: NuGet/setup-nuget@v1.0.5
+        with:
+          nuget-api-key: ${{ secrets.MYGETTOKEN }}
+          nuget-version: '5.x'
       
       - name: build
         shell: pwsh
@@ -20,5 +23,4 @@ jobs:
           nuget pack build-for-myget.nuspec
           $nupkgName = @(gci *.nupkg)[0].Name
           $mygetSourcePath = "https://www.myget.org/F/handycontrol"
-          nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath
           nuget push $nupkgName -Source $mygetSourcePath

From a254c160ee9620bbe86cc0a938ba86dd4af5ad64 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:37:09 +0800
Subject: [PATCH 36/56] Update build-for-myget.nuspec

---
 build/build-for-myget.nuspec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
index eb486ee9..e0f05369 100644
--- a/build/build-for-myget.nuspec
+++ b/build/build-for-myget.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>HandyControl</id>
-    <version>3.1.0.105401</version>
+    <version>3.1.0.105402</version>
     <title>HandyOrg</title>
     <authors>HandyOrg</authors>
     <owners>HandyOrg</owners>
@@ -203,8 +203,5 @@
     <file src="lib\netcoreapp3.1\HandyControl.dll" target="lib\netcoreapp3.1\HandyControl.dll" />
     <file src="lib\netcoreapp3.1\HandyControl.pdb" target="lib\netcoreapp3.1\HandyControl.pdb" />
     <file src="lib\netcoreapp3.1\HandyControl.xml" target="lib\netcoreapp3.1\HandyControl.xml" />
-    <file src="tools\VisualStudioToolsManifest.xml" target="tools\VisualStudioToolsManifest.xml" />
-    <file src="icon.png" target="icon.png" />
-    <file src="LICENSE" target="LICENSE" />
   </files>
 </package>
\ No newline at end of file

From b548bb96c51b06f6089c9834d88375f215b7b4be Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:50:22 +0800
Subject: [PATCH 37/56] Update build-for-myget.nuspec

---
 build/build-for-myget.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
index e0f05369..da736bee 100644
--- a/build/build-for-myget.nuspec
+++ b/build/build-for-myget.nuspec
@@ -7,7 +7,7 @@
     <authors>HandyOrg</authors>
     <owners>HandyOrg</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <license type="file">LICENSE</license>
+    <licenseUrl>https://raw.githubusercontent.com/HandyOrg/HandyControl/master/LICENSE</licenseUrl>
     <icon>icon.png</icon>
     <projectUrl>https://github.com/NaBian/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>

From 42c9b2c0a8e7772552efef0d30e4576d85b3fb1b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 17:58:23 +0800
Subject: [PATCH 38/56] Update build-for-myget.nuspec

---
 build/build-for-myget.nuspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
index da736bee..ba896ab4 100644
--- a/build/build-for-myget.nuspec
+++ b/build/build-for-myget.nuspec
@@ -8,7 +8,6 @@
     <owners>HandyOrg</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <licenseUrl>https://raw.githubusercontent.com/HandyOrg/HandyControl/master/LICENSE</licenseUrl>
-    <icon>icon.png</icon>
     <projectUrl>https://github.com/NaBian/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>
     <copyright>Copyright © HandyOrg 2018-2021</copyright>

From bbb01cc58cff81f4c05809d5be2b60269b39a579 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 18:04:18 +0800
Subject: [PATCH 39/56] Update build.yml

---
 .github/workflows/build.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fd2bde4..9d856c64 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: build
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
@@ -11,9 +11,6 @@ jobs:
         
       - name: setup nuget.exe
         uses: NuGet/setup-nuget@v1.0.5
-        with:
-          nuget-api-key: ${{ secrets.MYGETTOKEN }}
-          nuget-version: '5.x'
       
       - name: build
         shell: pwsh
@@ -23,4 +20,5 @@ jobs:
           nuget pack build-for-myget.nuspec
           $nupkgName = @(gci *.nupkg)[0].Name
           $mygetSourcePath = "https://www.myget.org/F/handycontrol"
+          nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath
           nuget push $nupkgName -Source $mygetSourcePath

From b2116f5f2165d838644297b51560e4b9b01fd2bd Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 18:22:33 +0800
Subject: [PATCH 40/56] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d856c64..5fa99cd3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: build
 
-on: [push]
+on: workflow_dispatch
 
 jobs:
   build:

From 98b9808f975fd3f97a2cbca45b038a282ecf854e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 18:23:51 +0800
Subject: [PATCH 41/56] Update and rename build.yml to push-to-myget.yml

---
 .github/workflows/{build.yml => push-to-myget.yml} | 2 --
 1 file changed, 2 deletions(-)
 rename .github/workflows/{build.yml => push-to-myget.yml} (97%)

diff --git a/.github/workflows/build.yml b/.github/workflows/push-to-myget.yml
similarity index 97%
rename from .github/workflows/build.yml
rename to .github/workflows/push-to-myget.yml
index 5fa99cd3..cf98ea60 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/push-to-myget.yml
@@ -1,5 +1,3 @@
-name: build
-
 on: workflow_dispatch
 
 jobs:

From 1b81fd5188139a05c2b8fe4d9703dcc5c2570b3d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 18:26:32 +0800
Subject: [PATCH 42/56] Create build.yml

---
 .github/workflows/build.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..d9212433
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,14 @@
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@master
+      
+      - name: build
+        shell: pwsh
+        run: |
+          cd build
+          .\build.ps1

From c680d01da95150f53dfdf4e291cf2c0a7faafd09 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Sat, 10 Apr 2021 15:10:30 +0430
Subject: [PATCH 43/56] Auto Increment version for MYGet build

---
 .github/workflows/push-to-myget.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-to-myget.yml b/.github/workflows/push-to-myget.yml
index cf98ea60..58ea9d3a 100644
--- a/.github/workflows/push-to-myget.yml
+++ b/.github/workflows/push-to-myget.yml
@@ -15,7 +15,7 @@ jobs:
         run: |
           cd build
           .\build.ps1
-          nuget pack build-for-myget.nuspec
+          nuget pack build-for-myget.nuspec -version 3.1.0-beta${env:GITHUB_RUN_NUMBER}
           $nupkgName = @(gci *.nupkg)[0].Name
           $mygetSourcePath = "https://www.myget.org/F/handycontrol"
           nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath

From 8c83ba9b82e7215a9c428d646a23872f836988ec Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 18:42:28 +0800
Subject: [PATCH 44/56] update readme

---
 README-cn.md | 5 ++++-
 README.md    | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README-cn.md b/README-cn.md
index f56a930a..ccf327ad 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -14,7 +14,10 @@
     <img alt="IDE-version" src="https://img.shields.io/badge/IDE-vs2019-blue.svg"></img>
     <a href="https://www.nuget.org/packages/HandyControl">
         <img alt="nuget-version" src="https://img.shields.io/nuget/v/HandyControl.svg"></img>
-    </a> 
+    </a>
+    <a href="https://www.myget.org/feed/handycontrol/package/nuget/HandyControl">
+        <img alt="myget-version" src="https://img.shields.io/myget/handycontrol/v/handycontrol?color=orange&label=myget"></img>
+    </a>  
     <a href="https://github.com/HandyOrg/HandyControl/actions?query=workflow%3Abuild">
         <img alt="Github-build-status" src="https://github.com/HandyOrg/HandyControl/workflows/build/badge.svg"></img>
     </a>
diff --git a/README.md b/README.md
index 4a73c6ce..51f11885 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,9 @@
     <a href="https://www.nuget.org/packages/HandyControl">
         <img alt="nuget-version" src="https://img.shields.io/nuget/v/HandyControl.svg"></img>
     </a> 
+    <a href="https://www.myget.org/feed/handycontrol/package/nuget/HandyControl">
+        <img alt="myget-version" src="https://img.shields.io/myget/handycontrol/v/handycontrol?color=orange&label=myget"></img>
+    </a> 
     <a href="https://github.com/HandyOrg/HandyControl/actions?query=workflow%3Abuild">
         <img alt="Github-build-status" src="https://github.com/HandyOrg/HandyControl/workflows/build/badge.svg"></img>
     </a>

From 5d5d8ca021b71b81b0c27f59ae05505953740b71 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Apr 2021 18:52:10 +0800
Subject: [PATCH 45/56] update Directory.Build.Props

---
 build/build-for-myget.nuspec                        |  2 +-
 build/build.nuspec                                  |  2 +-
 src/Directory.Build.Props                           | 12 +++++++-----
 .../HandyControlDemo_Net_40.csproj                  |  1 -
 .../HandyControl_Net_40/HandyControl_Net_40.csproj  | 13 +++++--------
 .../HandyControlDemo_Net_GE45.csproj                |  6 ------
 .../HandyControl_Net_GE45.csproj                    | 13 +++++--------
 .../HandyControlDemo_Code.csproj                    |  5 -----
 8 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
index ba896ab4..6f0627e0 100644
--- a/build/build-for-myget.nuspec
+++ b/build/build-for-myget.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>HandyControl</id>
-    <version>3.1.0.105402</version>
+    <version>3.1.0</version>
     <title>HandyOrg</title>
     <authors>HandyOrg</authors>
     <owners>HandyOrg</owners>
diff --git a/build/build.nuspec b/build/build.nuspec
index a2ca3d6d..6c255e8d 100644
--- a/build/build.nuspec
+++ b/build/build.nuspec
@@ -10,7 +10,7 @@
     <license type="file">LICENSE</license>
     <icon>icon.png</icon>
     <projectUrl>https://github.com/NaBian/HandyControl</projectUrl>
-    <description>Contains some commonly used simple WPF controls</description>
+    <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
     <copyright>Copyright © HandyOrg 2018-2021</copyright>
     <tags>WPF C# Control</tags>
diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props
index 18714da4..cb27ef60 100644
--- a/src/Directory.Build.Props
+++ b/src/Directory.Build.Props
@@ -1,11 +1,13 @@
 <Project>
     <PropertyGroup>
         <UseWPF>true</UseWPF>
-        <Version>3.0.0.0</Version>
-        <FileVersion>3.0.0.0</FileVersion>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <LangVersion>8.0</LangVersion>
-        <Copyright>Copyright © HandyOrg 2018-2020</Copyright>
+        <Version>3.1.0.0</Version>
+        <FileVersion>3.1.0.0</FileVersion>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <LangVersion>latest</LangVersion>
+        <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
         <Authors>HandyOrg</Authors>
+        <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
+        <PackageProjectUrl>https://handyorg.github.io/</PackageProjectUrl>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index dc9e03d7..bcbd56df 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -6,7 +6,6 @@
     <TargetFramework>net40</TargetFramework>
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
     <NoWarn>0108;MSB3026;MSB3061</NoWarn>
-    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 5d2db9ee..7b163473 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -3,18 +3,15 @@
     <AssemblyName>HandyControl</AssemblyName>
     <RootNamespace>HandyControl</RootNamespace>
     <TargetFramework>net40</TargetFramework>
-    <Description>Contains some commonly used simple WPF controls</Description>
+    <Description>Contains some simple and commonly used WPF controls</Description>
     <PackageId>HandyControl</PackageId>
-    <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <NoWarn>0067;0649;1591;0108;1717</NoWarn>
-    <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>..\..\Shared\HandyControl_Shared\key.snk</AssemblyOriginatorKeyFile>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
-    <Version>3.1.0.0</Version>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageTags>WPF C# Control</PackageTags>
+    <PackageReleaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</PackageReleaseNotes>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net40|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index e4c5a8ed..6166da8a 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -7,12 +7,6 @@
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
     <NoWarn>0108;MSB3026;MSB3061</NoWarn>
     <MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
-    <UseWPF>true</UseWPF>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
-    <Version>3.1.0.0</Version>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
     <ApplicationManifest>..\..\Shared\HandyControlDemo_Shared\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 195f24e6..9926b810 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -3,19 +3,16 @@
     <AssemblyName>HandyControl</AssemblyName>
     <RootNamespace>HandyControl</RootNamespace>
     <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows</TargetFrameworks>
-    <Description>Contains some commonly used simple WPF controls</Description>
+    <Description>Contains some simple and commonly used WPF controls</Description>
     <PackageId>HandyControl</PackageId>
-    <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <NoWarn>0067;0649;1591;MSB3061;SYSLIB0003;SYSLIB0004</NoWarn>
     <MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
-    <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>..\..\Shared\HandyControl_Shared\key.snk</AssemblyOriginatorKeyFile>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
-    <Version>3.1.0.0</Version>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageTags>WPF C# Control</PackageTags>
+    <PackageReleaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</PackageReleaseNotes>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index 92a65e77..c116cdcd 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -6,11 +6,6 @@
     <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows</TargetFrameworks>
     <NoWarn>MSB3026;MSB3061</NoWarn>
     <MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
-    <Version>3.1.0.0</Version>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Window\AboutWindow.xaml">

From 2c51fba36c9d9594d10159b451c7c5873215b192 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Sat, 10 Apr 2021 15:23:01 +0430
Subject: [PATCH 46/56] Update push-to-myget.yml

---
 .github/workflows/push-to-myget.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-to-myget.yml b/.github/workflows/push-to-myget.yml
index 58ea9d3a..13e263ed 100644
--- a/.github/workflows/push-to-myget.yml
+++ b/.github/workflows/push-to-myget.yml
@@ -15,7 +15,7 @@ jobs:
         run: |
           cd build
           .\build.ps1
-          nuget pack build-for-myget.nuspec -version 3.1.0-beta${env:GITHUB_RUN_NUMBER}
+          nuget pack build-for-myget.nuspec -version 3.1.0-beta.${env:GITHUB_RUN_NUMBER}
           $nupkgName = @(gci *.nupkg)[0].Name
           $mygetSourcePath = "https://www.myget.org/F/handycontrol"
           nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath

From f7ede3385b6692b0fd6aacfab09517b8fc7817d0 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 13 Apr 2021 20:54:55 +0800
Subject: [PATCH 47/56] bump up version to 3.2.0

---
 .github/workflows/push-to-myget.yml                         | 4 ++--
 src/Directory.Build.Props                                   | 6 +++---
 .../HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj  | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/push-to-myget.yml b/.github/workflows/push-to-myget.yml
index 13e263ed..daa13ce6 100644
--- a/.github/workflows/push-to-myget.yml
+++ b/.github/workflows/push-to-myget.yml
@@ -1,7 +1,7 @@
 on: workflow_dispatch
 
 jobs:
-  build:
+  push-to-myget:
     runs-on: windows-latest
     steps:
       - name: checkout
@@ -10,7 +10,7 @@ jobs:
       - name: setup nuget.exe
         uses: NuGet/setup-nuget@v1.0.5
       
-      - name: build
+      - name: build and push
         shell: pwsh
         run: |
           cd build
diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props
index cb27ef60..cb6332cc 100644
--- a/src/Directory.Build.Props
+++ b/src/Directory.Build.Props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <UseWPF>true</UseWPF>
-        <Version>3.1.0.0</Version>
-        <FileVersion>3.1.0.0</FileVersion>
-        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <Version>3.2.0.0</Version>
+        <FileVersion>3.2.0.0</FileVersion>
+        <AssemblyVersion>3.2.0.0</AssemblyVersion>
         <LangVersion>latest</LangVersion>
         <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
         <Authors>HandyOrg</Authors>
diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index bcbd56df..ca67dc56 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -584,11 +584,6 @@
       move tr Langs
       move ca-Es Langs
     </PostBuildEvent>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
-    <Version>3.1.0.0</Version>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
     <ApplicationManifest>..\..\Shared\HandyControlDemo_Shared\app.manifest</ApplicationManifest>
   </PropertyGroup>
 </Project>

From f4d4bdde1036ab3e160e805a40dea127d72616a5 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 14 Apr 2021 23:28:42 +0800
Subject: [PATCH 48/56] fixed #784 and optimized MeasureChild method

---
 .../Controls/Panel/RelativePanel.cs           | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
index 6b84450a..83c4897f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -27,7 +27,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignLeftWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignLeftWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignLeftWithPanelProperty);
+            => (bool)element.GetValue(AlignLeftWithPanelProperty);
 
         public static readonly DependencyProperty AlignTopWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignTopWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -36,7 +36,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignTopWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignTopWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignTopWithPanelProperty);
+            => (bool)element.GetValue(AlignTopWithPanelProperty);
 
         public static readonly DependencyProperty AlignRightWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignRightWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -45,7 +45,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignRightWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignRightWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignRightWithPanelProperty);
+            => (bool)element.GetValue(AlignRightWithPanelProperty);
 
         public static readonly DependencyProperty AlignBottomWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignBottomWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -54,7 +54,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignBottomWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignBottomWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignBottomWithPanelProperty);
+            => (bool)element.GetValue(AlignBottomWithPanelProperty);
 
         #endregion
 
@@ -68,7 +68,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignLeftWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignLeftWithProperty);
+            => (UIElement)element.GetValue(AlignLeftWithProperty);
 
         public static readonly DependencyProperty AlignTopWithProperty = DependencyProperty.RegisterAttached(
             "AlignTopWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -78,7 +78,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignTopWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignTopWithProperty);
+            => (UIElement)element.GetValue(AlignTopWithProperty);
 
         public static readonly DependencyProperty AlignRightWithProperty = DependencyProperty.RegisterAttached(
             "AlignRightWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -88,7 +88,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignRightWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignRightWithProperty);
+            => (UIElement)element.GetValue(AlignRightWithProperty);
 
         public static readonly DependencyProperty AlignBottomWithProperty = DependencyProperty.RegisterAttached(
             "AlignBottomWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -98,7 +98,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignBottomWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignBottomWithProperty);
+            => (UIElement)element.GetValue(AlignBottomWithProperty);
 
         #endregion
 
@@ -112,7 +112,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetLeftOf(DependencyObject element)
-            => (UIElement) element.GetValue(LeftOfProperty);
+            => (UIElement)element.GetValue(LeftOfProperty);
 
         public static readonly DependencyProperty AboveProperty = DependencyProperty.RegisterAttached(
             "Above", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -122,7 +122,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAbove(DependencyObject element)
-            => (UIElement) element.GetValue(AboveProperty);
+            => (UIElement)element.GetValue(AboveProperty);
 
         public static readonly DependencyProperty RightOfProperty = DependencyProperty.RegisterAttached(
             "RightOf", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -132,7 +132,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetRightOf(DependencyObject element)
-            => (UIElement) element.GetValue(RightOfProperty);
+            => (UIElement)element.GetValue(RightOfProperty);
 
         public static readonly DependencyProperty BelowProperty = DependencyProperty.RegisterAttached(
             "Below", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -142,7 +142,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetBelow(DependencyObject element)
-            => (UIElement) element.GetValue(BelowProperty);
+            => (UIElement)element.GetValue(BelowProperty);
 
         #endregion
 
@@ -155,7 +155,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignHorizontalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignHorizontalCenterWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignHorizontalCenterWithPanelProperty);
+            => (bool)element.GetValue(AlignHorizontalCenterWithPanelProperty);
 
         public static readonly DependencyProperty AlignVerticalCenterWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignVerticalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -164,7 +164,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignVerticalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignVerticalCenterWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignVerticalCenterWithPanelProperty);
+            => (bool)element.GetValue(AlignVerticalCenterWithPanelProperty);
 
         public static readonly DependencyProperty AlignHorizontalCenterWithProperty = DependencyProperty.RegisterAttached(
             "AlignHorizontalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -174,7 +174,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignHorizontalCenterWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignHorizontalCenterWithProperty);
+            => (UIElement)element.GetValue(AlignHorizontalCenterWithProperty);
 
         public static readonly DependencyProperty AlignVerticalCenterWithProperty = DependencyProperty.RegisterAttached(
             "AlignVerticalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -184,7 +184,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignVerticalCenterWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignVerticalCenterWithProperty);
+            => (UIElement)element.GetValue(AlignVerticalCenterWithProperty);
 
         #endregion
 
@@ -218,7 +218,7 @@ namespace HandyControl.Controls
             #region Calc AvailableSize
 
             _childGraph.Reset(false);
-            var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN());
+            var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN(), availableSize);
             _childGraph.Reset();
             _childGraph.Measure(boundingSize);
             return boundingSize;
@@ -454,6 +454,8 @@ namespace HandyControl.Controls
 
             private void MeasureChild(GraphNode node)
             {
+                var availableSize = AvailableSize;
+
                 var child = node.Element;
                 child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
                 node.OriginDesiredSize = child.DesiredSize;
@@ -502,10 +504,10 @@ namespace HandyControl.Controls
 
                 #region Measure
 
-                var availableHeight = AvailableSize.Height - node.Top - node.Bottom;
+                var availableHeight = availableSize.Height - node.Top - node.Bottom;
                 if (availableHeight.IsNaN())
                 {
-                    availableHeight = AvailableSize.Height;
+                    availableHeight = availableSize.Height;
 
                     if (!node.Top.IsNaN() && node.Bottom.IsNaN())
                     {
@@ -517,10 +519,10 @@ namespace HandyControl.Controls
                     }
                 }
 
-                var availableWidth = AvailableSize.Width - node.Left - node.Right;
+                var availableWidth = availableSize.Width - node.Left - node.Right;
                 if (availableWidth.IsNaN())
                 {
-                    availableWidth = AvailableSize.Width;
+                    availableWidth = availableSize.Width;
 
                     if (!node.Left.IsNaN() && node.Right.IsNaN())
                     {
@@ -558,7 +560,7 @@ namespace HandyControl.Controls
 
                     if (node.Left.IsNaN())
                     {
-                        node.Left = AvailableSize.Width - node.RightOfNode.Right;
+                        node.Left = availableSize.Width - node.RightOfNode.Right;
                     }
                 }
 
@@ -571,7 +573,7 @@ namespace HandyControl.Controls
 
                     if (node.Top.IsNaN())
                     {
-                        node.Top = AvailableSize.Height - node.BelowNode.Bottom;
+                        node.Top = availableSize.Height - node.BelowNode.Bottom;
                     }
                 }
 
@@ -581,8 +583,8 @@ namespace HandyControl.Controls
 
                 if (node.AlignHorizontalCenterWith != null)
                 {
-                    var halfWidthLeft = (AvailableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
-                    var halfWidthRight = (AvailableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
+                    var halfWidthLeft = (availableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
+                    var halfWidthRight = (availableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
 
                     if (node.Left.IsNaN()) node.Left = halfWidthLeft;
                     else node.Left = (node.Left + halfWidthLeft) * 0.5;
@@ -593,8 +595,8 @@ namespace HandyControl.Controls
 
                 if (node.AlignVerticalCenterWith != null)
                 {
-                    var halfHeightTop = (AvailableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
-                    var halfHeightBottom = (AvailableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+                    var halfHeightTop = (availableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+                    var halfHeightBottom = (availableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
 
                     if (node.Top.IsNaN()) node.Top = halfHeightTop;
                     else node.Top = (node.Top + halfHeightTop) * 0.5;
@@ -609,7 +611,7 @@ namespace HandyControl.Controls
 
                 if (GetAlignHorizontalCenterWithPanel(child))
                 {
-                    var halfSubWidth = (AvailableSize.Width - childSize.Width) * 0.5;
+                    var halfSubWidth = (availableSize.Width - childSize.Width) * 0.5;
 
                     if (node.Left.IsNaN()) node.Left = halfSubWidth;
                     else node.Left = (node.Left + halfSubWidth) * 0.5;
@@ -620,7 +622,7 @@ namespace HandyControl.Controls
 
                 if (GetAlignVerticalCenterWithPanel(child))
                 {
-                    var halfSubHeight = (AvailableSize.Height - childSize.Height) * 0.5;
+                    var halfSubHeight = (availableSize.Height - childSize.Height) * 0.5;
 
                     if (node.Top.IsNaN()) node.Top = halfSubHeight;
                     else node.Top = (node.Top + halfSubHeight) * 0.5;
@@ -634,37 +636,37 @@ namespace HandyControl.Controls
                 if (node.Left.IsNaN())
                 {
                     if (!node.Right.IsNaN())
-                        node.Left = AvailableSize.Width - node.Right - childSize.Width;
+                        node.Left = availableSize.Width - node.Right - childSize.Width;
                     else
                     {
                         node.Left = 0;
-                        node.Right = AvailableSize.Width - childSize.Width;
+                        node.Right = availableSize.Width - childSize.Width;
                     }
                 }
                 else if (!node.Left.IsNaN() && node.Right.IsNaN())
                 {
-                    node.Right = AvailableSize.Width - node.Left - childSize.Width;
+                    node.Right = availableSize.Width - node.Left - childSize.Width;
                 }
 
                 if (node.Top.IsNaN())
                 {
                     if (!node.Bottom.IsNaN())
-                        node.Top = AvailableSize.Height - node.Bottom - childSize.Height;
+                        node.Top = availableSize.Height - node.Bottom - childSize.Height;
                     else
                     {
                         node.Top = 0;
-                        node.Bottom = AvailableSize.Height - childSize.Height;
+                        node.Bottom = availableSize.Height - childSize.Height;
                     }
                 }
                 else if (!node.Top.IsNaN() && node.Bottom.IsNaN())
                 {
-                    node.Bottom = AvailableSize.Height - node.Top - childSize.Height;
+                    node.Bottom = availableSize.Height - node.Top - childSize.Height;
                 }
 
                 node.Measured = true;
             }
 
-            public Size GetBoundingSize(bool calcWidth, bool calcHeight)
+            public Size GetBoundingSize(bool calcWidth, bool calcHeight, Size availableSize)
             {
                 var boundingSize = new Size();
 
@@ -675,8 +677,8 @@ namespace HandyControl.Controls
                     boundingSize.Height = Math.Max(boundingSize.Height, size.Height);
                 }
 
-                boundingSize.Width = calcWidth ? boundingSize.Width : AvailableSize.Width;
-                boundingSize.Height = calcHeight ? boundingSize.Height : AvailableSize.Height;
+                boundingSize.Width = calcWidth ? Math.Max(availableSize.Width, boundingSize.Width) : availableSize.Width;
+                boundingSize.Height = calcHeight ? Math.Max(availableSize.Height, boundingSize.Height) : availableSize.Height;
                 return boundingSize;
             }
         }

From b30b2ce72a46c1c1cdbe61f5b0b80f74f1af382d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 14 Apr 2021 23:35:36 +0800
Subject: [PATCH 49/56] Update push-to-myget.yml

---
 .github/workflows/push-to-myget.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-to-myget.yml b/.github/workflows/push-to-myget.yml
index daa13ce6..1d100f37 100644
--- a/.github/workflows/push-to-myget.yml
+++ b/.github/workflows/push-to-myget.yml
@@ -15,7 +15,7 @@ jobs:
         run: |
           cd build
           .\build.ps1
-          nuget pack build-for-myget.nuspec -version 3.1.0-beta.${env:GITHUB_RUN_NUMBER}
+          nuget pack build-for-myget.nuspec -version 3.2.0-beta.${env:GITHUB_RUN_NUMBER}
           $nupkgName = @(gci *.nupkg)[0].Name
           $mygetSourcePath = "https://www.myget.org/F/handycontrol"
           nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath

From b53464d0ef992f24d2c63a38ed5d43714d7e8dca Mon Sep 17 00:00:00 2001
From: "github-actions-dotnet-formatter[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 15:37:11 +0000
Subject: [PATCH 50/56] Automated dotnet-format update

---
 .../Controls/Panel/RelativePanel.cs           | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
index 83c4897f..de0ed70f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -27,7 +27,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignLeftWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignLeftWithPanel(DependencyObject element)
-            => (bool)element.GetValue(AlignLeftWithPanelProperty);
+            => (bool) element.GetValue(AlignLeftWithPanelProperty);
 
         public static readonly DependencyProperty AlignTopWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignTopWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -36,7 +36,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignTopWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignTopWithPanel(DependencyObject element)
-            => (bool)element.GetValue(AlignTopWithPanelProperty);
+            => (bool) element.GetValue(AlignTopWithPanelProperty);
 
         public static readonly DependencyProperty AlignRightWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignRightWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -45,7 +45,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignRightWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignRightWithPanel(DependencyObject element)
-            => (bool)element.GetValue(AlignRightWithPanelProperty);
+            => (bool) element.GetValue(AlignRightWithPanelProperty);
 
         public static readonly DependencyProperty AlignBottomWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignBottomWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -54,7 +54,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignBottomWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignBottomWithPanel(DependencyObject element)
-            => (bool)element.GetValue(AlignBottomWithPanelProperty);
+            => (bool) element.GetValue(AlignBottomWithPanelProperty);
 
         #endregion
 
@@ -68,7 +68,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignLeftWith(DependencyObject element)
-            => (UIElement)element.GetValue(AlignLeftWithProperty);
+            => (UIElement) element.GetValue(AlignLeftWithProperty);
 
         public static readonly DependencyProperty AlignTopWithProperty = DependencyProperty.RegisterAttached(
             "AlignTopWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -78,7 +78,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignTopWith(DependencyObject element)
-            => (UIElement)element.GetValue(AlignTopWithProperty);
+            => (UIElement) element.GetValue(AlignTopWithProperty);
 
         public static readonly DependencyProperty AlignRightWithProperty = DependencyProperty.RegisterAttached(
             "AlignRightWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -88,7 +88,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignRightWith(DependencyObject element)
-            => (UIElement)element.GetValue(AlignRightWithProperty);
+            => (UIElement) element.GetValue(AlignRightWithProperty);
 
         public static readonly DependencyProperty AlignBottomWithProperty = DependencyProperty.RegisterAttached(
             "AlignBottomWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -98,7 +98,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignBottomWith(DependencyObject element)
-            => (UIElement)element.GetValue(AlignBottomWithProperty);
+            => (UIElement) element.GetValue(AlignBottomWithProperty);
 
         #endregion
 
@@ -112,7 +112,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetLeftOf(DependencyObject element)
-            => (UIElement)element.GetValue(LeftOfProperty);
+            => (UIElement) element.GetValue(LeftOfProperty);
 
         public static readonly DependencyProperty AboveProperty = DependencyProperty.RegisterAttached(
             "Above", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -122,7 +122,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAbove(DependencyObject element)
-            => (UIElement)element.GetValue(AboveProperty);
+            => (UIElement) element.GetValue(AboveProperty);
 
         public static readonly DependencyProperty RightOfProperty = DependencyProperty.RegisterAttached(
             "RightOf", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -132,7 +132,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetRightOf(DependencyObject element)
-            => (UIElement)element.GetValue(RightOfProperty);
+            => (UIElement) element.GetValue(RightOfProperty);
 
         public static readonly DependencyProperty BelowProperty = DependencyProperty.RegisterAttached(
             "Below", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -142,7 +142,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetBelow(DependencyObject element)
-            => (UIElement)element.GetValue(BelowProperty);
+            => (UIElement) element.GetValue(BelowProperty);
 
         #endregion
 
@@ -155,7 +155,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignHorizontalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignHorizontalCenterWithPanel(DependencyObject element)
-            => (bool)element.GetValue(AlignHorizontalCenterWithPanelProperty);
+            => (bool) element.GetValue(AlignHorizontalCenterWithPanelProperty);
 
         public static readonly DependencyProperty AlignVerticalCenterWithPanelProperty = DependencyProperty.RegisterAttached(
             "AlignVerticalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -164,7 +164,7 @@ namespace HandyControl.Controls
             => element.SetValue(AlignVerticalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAlignVerticalCenterWithPanel(DependencyObject element)
-            => (bool)element.GetValue(AlignVerticalCenterWithPanelProperty);
+            => (bool) element.GetValue(AlignVerticalCenterWithPanelProperty);
 
         public static readonly DependencyProperty AlignHorizontalCenterWithProperty = DependencyProperty.RegisterAttached(
             "AlignHorizontalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -174,7 +174,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignHorizontalCenterWith(DependencyObject element)
-            => (UIElement)element.GetValue(AlignHorizontalCenterWithProperty);
+            => (UIElement) element.GetValue(AlignHorizontalCenterWithProperty);
 
         public static readonly DependencyProperty AlignVerticalCenterWithProperty = DependencyProperty.RegisterAttached(
             "AlignVerticalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
@@ -184,7 +184,7 @@ namespace HandyControl.Controls
 
         [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignVerticalCenterWith(DependencyObject element)
-            => (UIElement)element.GetValue(AlignVerticalCenterWithProperty);
+            => (UIElement) element.GetValue(AlignVerticalCenterWithProperty);
 
         #endregion
 

From 916d3d12b2f04ea5115cc0088589741a64b62a0e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 19 Apr 2021 21:39:37 +0800
Subject: [PATCH 51/56] fixed #794

---
 .../Controls/Panel/RelativePanel.cs           | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
index 83c4897f..51cd00b4 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -218,7 +218,12 @@ namespace HandyControl.Controls
             #region Calc AvailableSize
 
             _childGraph.Reset(false);
-            var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN(), availableSize);
+
+
+            var calcWidth = Width.IsNaN() && HorizontalAlignment != HorizontalAlignment.Stretch;
+            var calcHeight = Height.IsNaN() && VerticalAlignment != VerticalAlignment.Stretch;
+
+            var boundingSize = _childGraph.GetBoundingSize(calcWidth, calcHeight);
             _childGraph.Reset();
             _childGraph.Measure(boundingSize);
             return boundingSize;
@@ -454,8 +459,6 @@ namespace HandyControl.Controls
 
             private void MeasureChild(GraphNode node)
             {
-                var availableSize = AvailableSize;
-
                 var child = node.Element;
                 child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
                 node.OriginDesiredSize = child.DesiredSize;
@@ -504,10 +507,10 @@ namespace HandyControl.Controls
 
                 #region Measure
 
-                var availableHeight = availableSize.Height - node.Top - node.Bottom;
+                var availableHeight = AvailableSize.Height - node.Top - node.Bottom;
                 if (availableHeight.IsNaN())
                 {
-                    availableHeight = availableSize.Height;
+                    availableHeight = AvailableSize.Height;
 
                     if (!node.Top.IsNaN() && node.Bottom.IsNaN())
                     {
@@ -519,10 +522,10 @@ namespace HandyControl.Controls
                     }
                 }
 
-                var availableWidth = availableSize.Width - node.Left - node.Right;
+                var availableWidth = AvailableSize.Width - node.Left - node.Right;
                 if (availableWidth.IsNaN())
                 {
-                    availableWidth = availableSize.Width;
+                    availableWidth = AvailableSize.Width;
 
                     if (!node.Left.IsNaN() && node.Right.IsNaN())
                     {
@@ -560,7 +563,7 @@ namespace HandyControl.Controls
 
                     if (node.Left.IsNaN())
                     {
-                        node.Left = availableSize.Width - node.RightOfNode.Right;
+                        node.Left = AvailableSize.Width - node.RightOfNode.Right;
                     }
                 }
 
@@ -573,7 +576,7 @@ namespace HandyControl.Controls
 
                     if (node.Top.IsNaN())
                     {
-                        node.Top = availableSize.Height - node.BelowNode.Bottom;
+                        node.Top = AvailableSize.Height - node.BelowNode.Bottom;
                     }
                 }
 
@@ -583,8 +586,8 @@ namespace HandyControl.Controls
 
                 if (node.AlignHorizontalCenterWith != null)
                 {
-                    var halfWidthLeft = (availableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
-                    var halfWidthRight = (availableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
+                    var halfWidthLeft = (AvailableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
+                    var halfWidthRight = (AvailableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
 
                     if (node.Left.IsNaN()) node.Left = halfWidthLeft;
                     else node.Left = (node.Left + halfWidthLeft) * 0.5;
@@ -595,8 +598,8 @@ namespace HandyControl.Controls
 
                 if (node.AlignVerticalCenterWith != null)
                 {
-                    var halfHeightTop = (availableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
-                    var halfHeightBottom = (availableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+                    var halfHeightTop = (AvailableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+                    var halfHeightBottom = (AvailableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
 
                     if (node.Top.IsNaN()) node.Top = halfHeightTop;
                     else node.Top = (node.Top + halfHeightTop) * 0.5;
@@ -611,7 +614,7 @@ namespace HandyControl.Controls
 
                 if (GetAlignHorizontalCenterWithPanel(child))
                 {
-                    var halfSubWidth = (availableSize.Width - childSize.Width) * 0.5;
+                    var halfSubWidth = (AvailableSize.Width - childSize.Width) * 0.5;
 
                     if (node.Left.IsNaN()) node.Left = halfSubWidth;
                     else node.Left = (node.Left + halfSubWidth) * 0.5;
@@ -622,7 +625,7 @@ namespace HandyControl.Controls
 
                 if (GetAlignVerticalCenterWithPanel(child))
                 {
-                    var halfSubHeight = (availableSize.Height - childSize.Height) * 0.5;
+                    var halfSubHeight = (AvailableSize.Height - childSize.Height) * 0.5;
 
                     if (node.Top.IsNaN()) node.Top = halfSubHeight;
                     else node.Top = (node.Top + halfSubHeight) * 0.5;
@@ -636,37 +639,37 @@ namespace HandyControl.Controls
                 if (node.Left.IsNaN())
                 {
                     if (!node.Right.IsNaN())
-                        node.Left = availableSize.Width - node.Right - childSize.Width;
+                        node.Left = AvailableSize.Width - node.Right - childSize.Width;
                     else
                     {
                         node.Left = 0;
-                        node.Right = availableSize.Width - childSize.Width;
+                        node.Right = AvailableSize.Width - childSize.Width;
                     }
                 }
                 else if (!node.Left.IsNaN() && node.Right.IsNaN())
                 {
-                    node.Right = availableSize.Width - node.Left - childSize.Width;
+                    node.Right = AvailableSize.Width - node.Left - childSize.Width;
                 }
 
                 if (node.Top.IsNaN())
                 {
                     if (!node.Bottom.IsNaN())
-                        node.Top = availableSize.Height - node.Bottom - childSize.Height;
+                        node.Top = AvailableSize.Height - node.Bottom - childSize.Height;
                     else
                     {
                         node.Top = 0;
-                        node.Bottom = availableSize.Height - childSize.Height;
+                        node.Bottom = AvailableSize.Height - childSize.Height;
                     }
                 }
                 else if (!node.Top.IsNaN() && node.Bottom.IsNaN())
                 {
-                    node.Bottom = availableSize.Height - node.Top - childSize.Height;
+                    node.Bottom = AvailableSize.Height - node.Top - childSize.Height;
                 }
 
                 node.Measured = true;
             }
 
-            public Size GetBoundingSize(bool calcWidth, bool calcHeight, Size availableSize)
+            public Size GetBoundingSize(bool calcWidth, bool calcHeight)
             {
                 var boundingSize = new Size();
 
@@ -677,8 +680,8 @@ namespace HandyControl.Controls
                     boundingSize.Height = Math.Max(boundingSize.Height, size.Height);
                 }
 
-                boundingSize.Width = calcWidth ? Math.Max(availableSize.Width, boundingSize.Width) : availableSize.Width;
-                boundingSize.Height = calcHeight ? Math.Max(availableSize.Height, boundingSize.Height) : availableSize.Height;
+                boundingSize.Width = calcWidth ? boundingSize.Width : AvailableSize.Width;
+                boundingSize.Height = calcHeight ? boundingSize.Height : AvailableSize.Height;
                 return boundingSize;
             }
         }

From 3719b59629c59cb2070f0a2c2756cb56dbadb234 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 20 Apr 2021 21:14:12 +0800
Subject: [PATCH 52/56] minor modify

---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml          | 8 ++++----
 .../Themes/Styles/Base/ExpanderBaseStyle.xaml             | 8 ++++----
 src/Shared/HandyControl_Shared/Themes/Theme.xaml          | 8 ++++----
 3 files changed, 12 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 1a9a5274..00a5e949 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -8290,7 +8290,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -8321,7 +8321,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -8357,7 +8357,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -8388,7 +8388,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
index 560a2d22..77084221 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
@@ -41,7 +41,7 @@
                 <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" Value="2" />
+                <Setter Property="Opacity" Value=".4" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -73,7 +73,7 @@
                 <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" Value="2" />
+                <Setter Property="Opacity" Value=".4" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -110,7 +110,7 @@
                 <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" Value="2" />
+                <Setter Property="Opacity" Value=".4" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -142,7 +142,7 @@
                 <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" Value="2" />
+                <Setter Property="Opacity" Value=".4" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 5ade2185..a202a1c2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -8408,7 +8408,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -8439,7 +8439,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -8475,7 +8475,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -8506,7 +8506,7 @@
 				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
 			</Trigger>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="2" />
+				<Setter Property="Opacity" Value=".4" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>

From 63acdfca0dad69e91a1e4358bc7b245243888fb7 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 21 Apr 2021 21:56:54 +0800
Subject: [PATCH 53/56] fixed #787

---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml          | 8 ++++----
 .../Themes/Styles/Base/ExpanderBaseStyle.xaml             | 8 ++++----
 src/Shared/HandyControl_Shared/Themes/Theme.xaml          | 8 ++++----
 3 files changed, 12 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 00a5e949..590a5318 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -8261,7 +8261,7 @@
 	<ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
 		<Grid>
 			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
 				<ColumnDefinition Width="Auto" />
 			</Grid.ColumnDefinitions>
 			<Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8297,7 +8297,7 @@
 	<ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
 		<Grid>
 			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
+				<RowDefinition />
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
 			<Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8329,7 +8329,7 @@
 		<Grid>
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
 			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
 				<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
@@ -8365,7 +8365,7 @@
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
+				<RowDefinition />
 			</Grid.RowDefinitions>
 			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
 				<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
index 77084221..3ccbc575 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
@@ -12,7 +12,7 @@
     <ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
             <Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -49,7 +49,7 @@
     <ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
+                <RowDefinition/>
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -82,7 +82,7 @@
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
                 <ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
@@ -119,7 +119,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition/>
             </Grid.RowDefinitions>
             <Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
                 <ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index a202a1c2..77c53086 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -8379,7 +8379,7 @@
 	<ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
 		<Grid>
 			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
 				<ColumnDefinition Width="Auto" />
 			</Grid.ColumnDefinitions>
 			<Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8415,7 +8415,7 @@
 	<ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
 		<Grid>
 			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
+				<RowDefinition />
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
 			<Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8447,7 +8447,7 @@
 		<Grid>
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
 			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
 				<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
@@ -8483,7 +8483,7 @@
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
+				<RowDefinition />
 			</Grid.RowDefinitions>
 			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
 				<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">

From 4d72f1f9210503c9e988eaf6832a0267b8b2c838 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 21 Apr 2021 22:34:00 +0800
Subject: [PATCH 54/56] Update MessageBox.cs

---
 .../Controls/Window/MessageBox.cs                    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index adfd8784..25af6967 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -50,6 +50,8 @@ namespace HandyControl.Controls
 
         private bool _showNo;
 
+        private IntPtr _lastActiveWindowIntPtr;
+
         public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
             "Message", typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
 
@@ -127,6 +129,16 @@ namespace HandyControl.Controls
             }
 
             base.OnSourceInitialized(e);
+
+            _lastActiveWindowIntPtr = InteropMethods.GetForegroundWindow();
+            Activate();
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            InteropMethods.SetForegroundWindow(_lastActiveWindowIntPtr);
+
+            base.OnClosed(e);
         }
 
         public override void OnApplyTemplate()

From 0b282aa1650d61fc072797c32e77d18346bae6f0 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 22 Apr 2021 15:07:04 +0800
Subject: [PATCH 55/56] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 51f11885..ff0508a5 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,10 @@
 
 ## 面向中国
 
+### 招聘
+
+百度地图，招 WPF 研发工程师，坐标上海，有意私聊 836904362@qq.com
+
 ### 码云
 
 [https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/)

From cc59d29a0bab25affe6765f29ece1eb4e7e761db Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 22 Apr 2021 15:07:35 +0800
Subject: [PATCH 56/56] Update README-cn.md

---
 README-cn.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README-cn.md b/README-cn.md
index ccf327ad..de6cc098 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -31,6 +31,10 @@
 
 ## 面向中国
 
+### 招聘
+
+百度地图，招 WPF 研发工程师，坐标上海，有意私聊 836904362@qq.com
+
 ### 码云
 
 [https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/)