From bebeb493a94f1e975ca02b1ffedb896d05cd84d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 19 Nov 2024 23:28:31 +0800
Subject: [PATCH 01/51] Update TargetFrameworks.props

---
 src/TargetFrameworks.props | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/TargetFrameworks.props b/src/TargetFrameworks.props
index 675ca381..20a68cdc 100644
--- a/src/TargetFrameworks.props
+++ b/src/TargetFrameworks.props
@@ -2,4 +2,34 @@
 	<PropertyGroup>
 		<TargetFrameworks>net45;net46;net47;net48;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;netcoreapp3.0</TargetFrameworks>
 	</PropertyGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+		<PackageReference Include="System.Drawing.Common">
+			<Version>7.0.0</Version>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
+		<PackageReference Include="System.Drawing.Common">
+			<Version>7.0.0</Version>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
+		<PackageReference Include="System.Drawing.Common">
+			<Version>7.0.0</Version>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
+		<PackageReference Include="System.Drawing.Common">
+			<Version>7.0.0</Version>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
+		<PackageReference Include="System.Drawing.Common">
+			<Version>7.0.0</Version>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+		<PackageReference Include="System.Drawing.Common">
+			<Version>7.0.0</Version>
+		</PackageReference>
+	</ItemGroup>
 </Project>
\ No newline at end of file

From f05fb269ea62e2d6551ebb9a3e3082f6c93ba692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 19 Nov 2024 23:28:38 +0800
Subject: [PATCH 02/51] Update WPFDevelopers.Net45x.csproj

---
 .../WPFDevelopers.Net45x.csproj               | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
index f62c243d..23f90c9f 100644
--- a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
+++ b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
@@ -23,34 +23,5 @@
 	    <Version>7.0.0</Version>
 	  </PackageReference>
 	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
-	  <PackageReference Include="System.Drawing.Common">
-	    <Version>7.0.0</Version>
-	  </PackageReference>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
-	  <PackageReference Include="System.Drawing.Common">
-	    <Version>7.0.0</Version>
-	  </PackageReference>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
-	  <PackageReference Include="System.Drawing.Common">
-	    <Version>7.0.0</Version>
-	  </PackageReference>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
-		<PackageReference Include="System.Drawing.Common">
-			<Version>7.0.0</Version>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
-		<PackageReference Include="System.Drawing.Common">
-			<Version>7.0.0</Version>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-	  <PackageReference Include="System.Drawing.Common">
-	    <Version>7.0.0</Version>
-	  </PackageReference>
-	</ItemGroup>
+	
 </Project>
\ No newline at end of file

From f1d464f5192a32bdb245848d85900488eac7befb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 19 Nov 2024 23:29:34 +0800
Subject: [PATCH 03/51] =?UTF-8?q?add=20in=20DateRange=EF=BC=88#118?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
index d59266fd..f41b2163 100644
--- a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
+++ b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
@@ -54,5 +54,7 @@ public enum PackIconKind
         [Description("WD.BreadCrumbBarGeometry")] BreadCrumbBar,
         [Description("WD.UnfoldMoreGeometry")] UnfoldMore,
         [Description("WD.TimeGeometry")] Time,
+        [Description("WD.DateRangeRightGeometry")] DateRangeRight,
+        [Description("WD.DateGeometry")] Date,
     }
 }

From b958ef146cfbd4f7bb4e60663da67efe0a3bf1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 19 Nov 2024 23:29:52 +0800
Subject: [PATCH 04/51] Update PanningItemsExample.xaml.cs

---
 .../ExampleViews/PanningItemsExample.xaml.cs       | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/PanningItemsExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/PanningItemsExample.xaml.cs
index a9cf3f9f..3b1a801e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/PanningItemsExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/PanningItemsExample.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {

From 0f4099fa902cd6e9e9033b7c99d1f8fdead421c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 19 Nov 2024 23:30:06 +0800
Subject: [PATCH 05/51] Update ChatEmoji.cs

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

diff --git a/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs b/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs
index 402a96a6..a1363adb 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs
+++ b/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs
@@ -122,7 +122,7 @@ private void UpdateIsRight()
                 rightWrapPanel == null) return;
             if (!IsRight)
             {
-                m_textBlock.Foreground = Brushes.White;
+                //m_textBlock.Foreground = Brushes.White;
                 leftWrapPanel.Visibility = Visibility.Visible;
                 border.Background = ControlsHelper.Brush;
                 rightWrapPanel.Visibility = Visibility.Collapsed;

From 7e2dc528bc8c58f8a59b3d66dc70102945e08248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 22:32:20 +0800
Subject: [PATCH 06/51] Update Styles.ComboBox.xaml

---
 .../Styles/Styles.ComboBox.xaml                 | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
index d7f35b17..8d80c7dc 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
@@ -14,14 +14,14 @@
             Padding="6,1.2"
             BorderThickness="0"
             SnapsToDevicePixels="true">
-            <Grid Background="Transparent">
+            <Grid HorizontalAlignment="Right" Background="Transparent">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="30" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
                 </Grid.ColumnDefinitions>
                 <Rectangle
                     Grid.Column="1"
-                    Width="30"
+                    Width="20"
                     Height="Auto"
                     Margin="0,1"
                     Fill="{TemplateBinding Background}" />
@@ -131,7 +131,11 @@
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         SnapsToDevicePixels="True">
-                        <controls:SmallPanel>
+                        <Grid Grid.IsSharedSizeScope="true">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                            </Grid.ColumnDefinitions>
                             <ContentPresenter
                                 x:Name="ContentSite"
                                 Margin="{TemplateBinding Padding}"
@@ -169,6 +173,7 @@
                                 Visibility="Collapsed" />
                             <ToggleButton
                                 x:Name="PART_ToggleButton"
+                                Grid.ColumnSpan="2"
                                 Background="{TemplateBinding Background}"
                                 ClickMode="Press"
                                 Focusable="False"
@@ -232,7 +237,7 @@
                                     <VisualState x:Name="Uneditable" />
                                 </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
-                        </controls:SmallPanel>
+                        </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">

From cddd9b4347e24db2d9fe070dbd7eca3f5816a5f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 22:32:37 +0800
Subject: [PATCH 07/51] Update MultiSelectComboBox.xaml

---
 .../Themes/MultiSelectComboBox.xaml           | 197 +++++++++---------
 1 file changed, 104 insertions(+), 93 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
index 00704433..4e9ede24 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
@@ -67,6 +67,8 @@
         <Setter Property="ItemContainerStyle" Value="{StaticResource WD.DefaultMultiSelectComboBoxItem}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
@@ -92,99 +94,108 @@
                                 Duration="00:00:.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <controls:SmallPanel SnapsToDevicePixels="True">
-                        <Border
-                            Name="PART_Border"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                            SnapsToDevicePixels="True" />
-                        <TextBox
-                            Name="PART_EditableTextBox"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Panel.ZIndex="1"
-                            Background="Transparent"
-                            Focusable="True"
-                            Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
-                            IsReadOnly="True"
-                            SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
-                            Style="{x:Null}"
-                            Template="{StaticResource WD.ComboBoxTextBox}"
-                            Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
-                        <TextBlock
-                            x:Name="PART_Watermark"
-                            Margin="{TemplateBinding Padding}"
-                            Padding="1,0"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Background="Transparent"
-                            FontSize="{StaticResource WD.NormalFontSize}"
-                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
-                            IsHitTestVisible="False"
-                            Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                            TextTrimming="CharacterEllipsis"
-                            Visibility="Collapsed" />
-                        <ToggleButton
-                            x:Name="PART_ToggleButton"
-                            Background="{TemplateBinding Background}"
-                            ClickMode="Release"
-                            Focusable="False"
-                            IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            Style="{x:Null}"
-                            Template="{StaticResource WD.ComboBoxToggleButton}" />
-                        <Popup
-                            x:Name="PART_Popup"
-                            AllowsTransparency="True"
-                            IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                            Placement="Bottom"
-                            PlacementTarget="{Binding ElementName=PART_ToggleButton}"
-                            StaysOpen="False">
-                            <controls:SmallPanel
-                                x:Name="PART_DropDown"
-                                MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
-                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                Margin="24,2,24,24"
-                                RenderTransformOrigin=".5,0"
-                                SnapsToDevicePixels="True">
-                                <controls:SmallPanel.RenderTransform>
-                                    <ScaleTransform ScaleY="0" />
-                                </controls:SmallPanel.RenderTransform>
-                                <Border
-                                    Name="PART_DropDownBorder"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                    Effect="{StaticResource WD.PopupShadowDepth}"
-                                    SnapsToDevicePixels="True"
-                                    UseLayoutRounding="True" />
-                                <Grid Margin="0,8" ClipToBounds="False">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <controls:MultiSelectComboBoxItem
-                                        x:Name="PART_CheckBoxAll"
-                                        Content="{TemplateBinding SelectAllContent}"
-                                        Style="{TemplateBinding ItemContainerStyle}"
-                                        Visibility="{TemplateBinding IsSelectAllActive,
-                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-                                    <ScrollViewer
-                                        x:Name="DropDownScrollViewer"
-                                        Grid.Row="1"
-                                        ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                        <ItemsPresenter
-                                            x:Name="ItemsPresenter"
-                                            KeyboardNavigation.DirectionalNavigation="Contained"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                    </ScrollViewer>
-                                </Grid>
-                            </controls:SmallPanel>
-                        </Popup>
-                    </controls:SmallPanel>
+                    <Border
+                        Name="PART_Border"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        SnapsToDevicePixels="True">
+                        <Grid Grid.IsSharedSizeScope="true">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                            </Grid.ColumnDefinitions>
+                            <TextBox
+                                Name="PART_EditableTextBox"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Panel.ZIndex="1"
+                                Background="Transparent"
+                                Focusable="True"
+                                Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
+                                IsReadOnly="True"
+                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+                                Style="{x:Null}"
+                                Template="{StaticResource WD.ComboBoxTextBox}"
+                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
+                            <TextBlock
+                                x:Name="PART_Watermark"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="Transparent"
+                                FontSize="{StaticResource WD.NormalFontSize}"
+                                Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
+                                IsHitTestVisible="False"
+                                Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                TextTrimming="CharacterEllipsis"
+                                Visibility="Collapsed" />
+                            <ToggleButton
+                                x:Name="PART_ToggleButton"
+                                Grid.ColumnSpan="2"
+                                Background="{TemplateBinding Background}"
+                                ClickMode="Release"
+                                Focusable="False"
+                                IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{x:Null}"
+                                Template="{StaticResource WD.ComboBoxToggleButton}" />
+                            <Popup
+                                x:Name="PART_Popup"
+                                AllowsTransparency="True"
+                                IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                Placement="Bottom"
+                                PlacementTarget="{Binding ElementName=PART_Border}"
+                                StaysOpen="False">
+                                <controls:SmallPanel
+                                    x:Name="PART_DropDown"
+                                    MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                    Margin="24,2,24,24"
+                                    RenderTransformOrigin=".5,0"
+                                    SnapsToDevicePixels="True">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Border
+                                        Name="PART_DropDownBorder"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                        Effect="{StaticResource WD.PopupShadowDepth}"
+                                        SnapsToDevicePixels="True"
+                                        UseLayoutRounding="True" />
+                                    <Grid Margin="0,8" ClipToBounds="False">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition />
+                                        </Grid.RowDefinitions>
+                                        <controls:MultiSelectComboBoxItem
+                                            x:Name="PART_CheckBoxAll"
+                                            Content="{TemplateBinding SelectAllContent}"
+                                            Style="{TemplateBinding ItemContainerStyle}"
+                                            Visibility="{TemplateBinding IsSelectAllActive,
+                                                                         Converter={StaticResource WD.Bool2VisibilityConverter}}" />
+                                        <ScrollViewer
+                                            x:Name="DropDownScrollViewer"
+                                            Grid.Row="1"
+                                            ScrollViewer.VerticalScrollBarVisibility="Auto">
+                                            <ItemsPresenter
+                                                x:Name="ItemsPresenter"
+                                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                        </ScrollViewer>
+                                    </Grid>
+                                </controls:SmallPanel>
+                            </Popup>
+                        </Grid>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
                             <Trigger.EnterActions>

From 675638282dd5a77a34013f6f3b803a1a1cf6876f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 22:32:45 +0800
Subject: [PATCH 08/51] Update MultiSelectSearchComboBox.xaml

---
 .../Themes/MultiSelectSearchComboBox.xaml     | 271 +++++++++---------
 1 file changed, 142 insertions(+), 129 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
index 0e4a2abc..cfa3b5ce 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
@@ -17,6 +17,8 @@
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
@@ -42,136 +44,147 @@
                                 Duration="00:00:.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <controls:SmallPanel SnapsToDevicePixels="True">
-                        <Border
-                            Name="PART_Border"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                            SnapsToDevicePixels="True" />
-                        <TextBox
-                            Name="PART_EditableTextBox"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Panel.ZIndex="1"
-                            Background="Transparent"
-                            Focusable="True"
-                            Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
-                            IsReadOnly="True"
-                            SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
-                            Style="{x:Null}"
-                            Template="{StaticResource WD.ComboBoxTextBox}"
-                            Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
-                        <TextBlock
-                            x:Name="PART_Watermark"
-                            Margin="{TemplateBinding Padding}"
-                            Padding="1,0"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Background="Transparent"
-                            FontSize="{StaticResource WD.NormalFontSize}"
-                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
-                            IsHitTestVisible="False"
-                            Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
-                            TextTrimming="CharacterEllipsis"
-                            Visibility="Collapsed" />
-                        <ToggleButton
-                            x:Name="PART_ToggleButton"
-                            Background="{TemplateBinding Background}"
-                            ClickMode="Release"
-                            Focusable="False"
-                            IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            Style="{x:Null}"
-                            Template="{StaticResource WD.ComboBoxToggleButton}" />
-                        <Popup
-                            x:Name="PART_Popup"
-                            AllowsTransparency="True"
-                            IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                            Placement="Bottom"
-                            PlacementTarget="{Binding ElementName=PART_ToggleButton}"
-                            StaysOpen="False">
-                            <controls:SmallPanel
-                                x:Name="PART_DropDown"
-                                MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
-                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                Margin="24,2,24,24"
-                                RenderTransformOrigin=".5,0"
-                                SnapsToDevicePixels="True">
-                                <controls:SmallPanel.RenderTransform>
-                                    <ScaleTransform ScaleY="0" />
-                                </controls:SmallPanel.RenderTransform>
-                                <Border
-                                    Name="PART_DropDownBorder"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                    Effect="{StaticResource WD.PopupShadowDepth}"
-                                    SnapsToDevicePixels="True"
-                                    UseLayoutRounding="True" />
-                                <Grid Margin="0,8" ClipToBounds="False">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <TextBox
-                                        x:Name="PART_TextBox"
-                                        Margin="6,0"
-                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                        helpers:ElementHelper.IsClear="True"
-                                        helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
-                                    <CheckBox
-                                        x:Name="PART_SelectAll"
-                                        Grid.Row="1"
-                                        Margin="4"
-                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                        Content="{TemplateBinding SelectAllContent}"
-                                        Visibility="{TemplateBinding IsSelectAllActive,
-                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-                                    <controls:MultiSelectListBox
-                                        x:Name="PART_Selector"
-                                        Grid.Row="2"
-                                        Margin="1,0"
-                                        Padding="{TemplateBinding Padding}"
-                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                    <Border
+                        Name="PART_Border"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        SnapsToDevicePixels="True">
+                        <Grid Grid.IsSharedSizeScope="true">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                            </Grid.ColumnDefinitions>
+                            <TextBox
+                                Name="PART_EditableTextBox"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Panel.ZIndex="1"
+                                Background="Transparent"
+                                Focusable="True"
+                                Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
+                                IsReadOnly="True"
+                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+                                Style="{x:Null}"
+                                Template="{StaticResource WD.ComboBoxTextBox}"
+                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
+                            <TextBlock
+                                x:Name="PART_Watermark"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="Transparent"
+                                FontSize="{StaticResource WD.NormalFontSize}"
+                                Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
+                                IsHitTestVisible="False"
+                                Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
+                                TextTrimming="CharacterEllipsis"
+                                Visibility="Collapsed" />
+                            <ToggleButton
+                                x:Name="PART_ToggleButton"
+                                Grid.ColumnSpan="2"
+                                Background="{TemplateBinding Background}"
+                                ClickMode="Release"
+                                Focusable="False"
+                                IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{x:Null}"
+                                Template="{StaticResource WD.ComboBoxToggleButton}" />
+                            <Popup
+                                x:Name="PART_Popup"
+                                AllowsTransparency="True"
+                                IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                Placement="Bottom"
+                                PlacementTarget="{Binding ElementName=PART_Border}"
+                                StaysOpen="False">
+                                <controls:SmallPanel
+                                    x:Name="PART_DropDown"
+                                    MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                    Margin="24,2,24,24"
+                                    RenderTransformOrigin=".5,0"
+                                    SnapsToDevicePixels="True">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Border
+                                        Name="PART_DropDownBorder"
+                                        Background="{TemplateBinding Background}"
                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="0"
-                                        DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
-                                        ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}"
-                                        ItemsSource="{TemplateBinding ItemsSource}"
-                                        ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}"
-                                        ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}"
-                                        SelectedValuePath="{TemplateBinding SelectedValuePath}"
-                                        SelectionMode="Multiple"
-                                        Style="{StaticResource WD.DefaultListBox}" />
-                                    <controls:MultiSelectListBox
-                                        x:Name="PART_SearchSelector"
-                                        Grid.Row="2"
-                                        Margin="1,0"
-                                        Padding="{TemplateBinding Padding}"
-                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="0"
-                                        DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
-                                        ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}"
-                                        ItemsSource="{TemplateBinding ItemsSourceSearch}"
-                                        ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}"
-                                        ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}"
-                                        SelectedValuePath="{TemplateBinding SelectedValuePath}"
-                                        SelectionMode="Multiple"
-                                        Style="{StaticResource WD.DefaultListBox}"
-                                        Visibility="Collapsed" />
-                                </Grid>
-                            </controls:SmallPanel>
-                        </Popup>
-                    </controls:SmallPanel>
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                        Effect="{StaticResource WD.PopupShadowDepth}"
+                                        SnapsToDevicePixels="True"
+                                        UseLayoutRounding="True" />
+                                    <Grid Margin="0,8" ClipToBounds="False">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition />
+                                        </Grid.RowDefinitions>
+                                        <TextBox
+                                            x:Name="PART_TextBox"
+                                            Height="{Binding ElementName=PART_EditableTextBox, Path=Height}"
+                                            Margin="6,0"
+                                            helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                            helpers:ElementHelper.IsClear="True"
+                                            helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                            FontSize="{Binding ElementName=PART_EditableTextBox, Path=FontSize}" />
+                                        <CheckBox
+                                            x:Name="PART_SelectAll"
+                                            Grid.Row="1"
+                                            Margin="4"
+                                            helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                            Content="{TemplateBinding SelectAllContent}"
+                                            Visibility="{TemplateBinding IsSelectAllActive,
+                                                                         Converter={StaticResource WD.Bool2VisibilityConverter}}" />
+                                        <controls:MultiSelectListBox
+                                            x:Name="PART_Selector"
+                                            Grid.Row="2"
+                                            Margin="1,0"
+                                            Padding="{TemplateBinding Padding}"
+                                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                            helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="0"
+                                            DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                                            ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}"
+                                            ItemsSource="{TemplateBinding ItemsSource}"
+                                            ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}"
+                                            SelectedValuePath="{TemplateBinding SelectedValuePath}"
+                                            SelectionMode="Multiple"
+                                            Style="{StaticResource WD.DefaultListBox}" />
+                                        <controls:MultiSelectListBox
+                                            x:Name="PART_SearchSelector"
+                                            Grid.Row="2"
+                                            Margin="1,0"
+                                            Padding="{TemplateBinding Padding}"
+                                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                            helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="0"
+                                            DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                                            ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}"
+                                            ItemsSource="{TemplateBinding ItemsSourceSearch}"
+                                            ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}"
+                                            SelectedValuePath="{TemplateBinding SelectedValuePath}"
+                                            SelectionMode="Multiple"
+                                            Style="{StaticResource WD.DefaultListBox}"
+                                            Visibility="Collapsed" />
+                                    </Grid>
+                                </controls:SmallPanel>
+                            </Popup>
+                        </Grid>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
                             <Trigger.EnterActions>

From e0516fe4e0868037fc3fbd6838c9b0a7ea491fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 22:33:09 +0800
Subject: [PATCH 09/51] Update DateRangePickerExample.xaml

---
 .../ExampleViews/DateRangePickerExample.xaml                    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml
index cef95d18..f5614b32 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml
@@ -19,8 +19,6 @@
                 EndWatermark="结束日期"
                 StartWatermark="开始日期" />
             <wd:DateRangePicker
-                Width="300"
-                Height="38"
                 VerticalAlignment="Top"
                 wd:ElementHelper.CornerRadius="3"
                 EndWatermark="EndDate"

From 652f76d3ec5d1177c58c5d656f81f1a2df128cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 22:33:16 +0800
Subject: [PATCH 10/51] Update MultiSelectComboBoxExample.xaml

---
 .../ExampleViews/MultiSelectComboBoxExample.xaml                | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
index 3496b003..a9e3b38a 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
@@ -34,9 +34,7 @@
                 Rows="2">
                 <wd:MultiSelectComboBox
                     Width="200"
-                    Height="38"
                     HorizontalAlignment="Center"
-                    VerticalContentAlignment="Center"
                     Delimiter="^"
                     IsSelectAllActive="True">
                     <wd:MultiSelectComboBoxItem>Option 1</wd:MultiSelectComboBoxItem>

From a9f54012f757ba845efd4436048af6d5793b0eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 22:34:09 +0800
Subject: [PATCH 11/51] Update MultiSelectSearchComboBoxExample.xaml

---
 .../MultiSelectSearchComboBoxExample.xaml          | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
index 9be76a4c..c2b57c91 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
@@ -30,13 +30,12 @@
                 Style="{StaticResource WD.SuccessPrimaryButton}" />
             <UniformGrid
                 Grid.Row="1"
+                wd:PanelHelper.Spacing="4"
                 Columns="2"
                 Rows="2">
                 <wd:MultiSelectionSearchComboBox
                     Width="200"
                     Height="38"
-                    HorizontalAlignment="Center"
-                    VerticalContentAlignment="Center"
                     Delimiter=","
                     DisplayMemberPath="Number"
                     IsSelectAllActive="True"
@@ -48,9 +47,6 @@
                 </wd:MultiSelectionSearchComboBox>
                 <wd:MultiSelectionSearchComboBox
                     Width="200"
-                    Height="38"
-                    HorizontalAlignment="Center"
-                    VerticalContentAlignment="Center"
                     wd:ElementHelper.Watermark="MultiSelectionSearchComboBox"
                     Delimiter="^"
                     DisplayMemberPath="Number"
@@ -66,8 +62,6 @@
                     Name="MyMultiSelectionSearchComboBox2"
                     Width="200"
                     Height="38"
-                    HorizontalAlignment="Center"
-                    VerticalContentAlignment="Center"
                     wd:ElementHelper.Watermark="下拉多选搜索"
                     Delimiter="^"
                     IsSelectAllActive="True"
@@ -76,12 +70,10 @@
                     Name="MyMultiSelectionSearchComboBox3"
                     Width="200"
                     Height="38"
-                    HorizontalAlignment="Center"
-                    VerticalContentAlignment="Center"
+                    wd:ElementHelper.CornerRadius="3"
                     Delimiter=","
                     DisplayMemberPath="Name"
-                    SelectedValuePath="ID" 
-                    wd:ElementHelper.CornerRadius="3"/>
+                    SelectedValuePath="ID" />
             </UniformGrid>
         </Grid>
         <controls:CodeViewer.SourceCodes>

From 7617697b0b83d6a38b8fe10e433978b8cba40820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 23:16:56 +0800
Subject: [PATCH 12/51] Update DateRangePicker.xaml

---
 .../Themes/DateRangePicker.xaml               | 197 +++++++++---------
 1 file changed, 99 insertions(+), 98 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml b/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
index 0070cf1b..8c810d93 100644
--- a/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
+++ b/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
@@ -31,7 +31,7 @@
                             </StackPanel>
                         </DataTemplate>
                     </ControlTemplate.Resources>
-                    <controls:SmallPanel x:Name="PART_Root" Margin="{TemplateBinding Margin}">
+                    <controls:SmallPanel x:Name="PART_Root">
                         <Border
                             Background="{DynamicResource WD.BackgroundSolidColorBrush}"
                             BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
@@ -125,12 +125,6 @@
                                 </Grid>
                             </Grid>
                         </Border>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Disabled" />
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
@@ -150,6 +144,8 @@
     <Style x:Key="WD.DateRangePicker" TargetType="{x:Type controls:DateRangePicker}">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
@@ -175,98 +171,103 @@
                                 Duration="00:00:.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <controls:SmallPanel SnapsToDevicePixels="True">
-                        <Border
-                            Name="PART_Border"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                            SnapsToDevicePixels="True" />
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <controls:PathIcon
-                                Margin="15,0,0,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Kind="Date" />
-                            <DatePickerTextBox
-                                x:Name="PART_TextBoxStart"
-                                Grid.Column="1"
-                                Width="Auto"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                helpers:DatePickerHelper.Watermark="{Binding StartWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                Background="Transparent"
-                                Focusable="True"
-                                Foreground="{TemplateBinding Foreground}"
-                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-                            <controls:PathIcon
-                                Grid.Column="2"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Kind="DateRangeRight" />
-                            <DatePickerTextBox
-                                x:Name="PART_TextBoxEnd"
-                                Grid.Column="3"
-                                Width="Auto"
-                                Margin="10,0,0,0"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                helpers:DatePickerHelper.Watermark="{Binding EndWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                Background="Transparent"
-                                Focusable="True"
-                                Foreground="{TemplateBinding Foreground}"
-                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-                        </Grid>
-                        <Popup
-                            x:Name="PART_Popup"
-                            MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
-                            AllowsTransparency="True"
-                            Focusable="False"
-                            Placement="Bottom"
-                            StaysOpen="False"
-                            VerticalOffset="2">
-                            <controls:SmallPanel
-                                x:Name="PART_DropDown"
+                    <Border
+                        Name="PART_Border"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        SnapsToDevicePixels="True">
+                        <controls:SmallPanel SnapsToDevicePixels="True">
+                            <Grid Margin="{TemplateBinding Padding}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <controls:PathIcon
+                                    Margin="15,0,0,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Kind="Date" />
+                                <DatePickerTextBox
+                                    x:Name="PART_TextBoxStart"
+                                    Grid.Column="1"
+                                    Width="Auto"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    helpers:DatePickerHelper.Watermark="{Binding StartWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                    Background="Transparent"
+                                    Focusable="True"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+                                <controls:PathIcon
+                                    Grid.Column="2"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Kind="DateRangeRight" />
+                                <DatePickerTextBox
+                                    x:Name="PART_TextBoxEnd"
+                                    Grid.Column="3"
+                                    Width="Auto"
+                                    Margin="10,0,0,0"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    helpers:DatePickerHelper.Watermark="{Binding EndWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                    Background="Transparent"
+                                    Focusable="True"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+                            </Grid>
+                            <Popup
+                                x:Name="PART_Popup"
                                 MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
-                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                Margin="24,2,24,24"
-                                RenderTransformOrigin=".5,0"
-                                SnapsToDevicePixels="True">
-                                <controls:SmallPanel.RenderTransform>
-                                    <ScaleTransform ScaleY="0" />
-                                </controls:SmallPanel.RenderTransform>
-                                <Border
-                                    Name="PART_DropDownBorder"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                    Effect="{StaticResource WD.PopupShadowDepth}"
-                                    SnapsToDevicePixels="True"
-                                    UseLayoutRounding="True" />
-                                <StackPanel Orientation="Horizontal">
-                                    <Calendar
-                                        x:Name="PART_StartCalendar"
-                                        Margin="2,0,0,0"
-                                        BorderThickness="0"
-                                        CalendarItemStyle="{StaticResource WD.NoShadowCalendarItemStyle}"
-                                        SelectionMode="MultipleRange" />
-                                    <Calendar
-                                        x:Name="PART_EndCalendar"
-                                        Margin="0,0,2,0"
-                                        BorderThickness="0"
-                                        CalendarItemStyle="{StaticResource WD.NoShadowCalendarItemStyle}"
-                                        SelectionMode="MultipleRange" />
-                                </StackPanel>
-                            </controls:SmallPanel>
-                        </Popup>
-                    </controls:SmallPanel>
+                                AllowsTransparency="True"
+                                Focusable="False"
+                                Placement="Bottom"
+                                StaysOpen="False"
+                                VerticalOffset="2">
+                                <controls:SmallPanel
+                                    x:Name="PART_DropDown"
+                                    MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                    Margin="24,2,24,24"
+                                    RenderTransformOrigin=".5,0"
+                                    SnapsToDevicePixels="True">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Border
+                                        Name="PART_DropDownBorder"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                        Effect="{StaticResource WD.PopupShadowDepth}"
+                                        SnapsToDevicePixels="True"
+                                        UseLayoutRounding="True" />
+                                    <StackPanel Orientation="Horizontal">
+                                        <Calendar
+                                            x:Name="PART_StartCalendar"
+                                            Margin="2,0,0,0"
+                                            BorderThickness="0"
+                                            CalendarItemStyle="{StaticResource WD.NoShadowCalendarItemStyle}"
+                                            SelectionMode="MultipleRange" />
+                                        <Calendar
+                                            x:Name="PART_EndCalendar"
+                                            Margin="0,0,2,0"
+                                            BorderThickness="0"
+                                            CalendarItemStyle="{StaticResource WD.NoShadowCalendarItemStyle}"
+                                            SelectionMode="MultipleRange" />
+                                    </StackPanel>
+                                </controls:SmallPanel>
+                            </Popup>
+                        </controls:SmallPanel>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="PART_Popup" Property="IsOpen" Value="True">
                             <Trigger.EnterActions>

From 2a19b9868f10d9667f0bbb38630364c71e836fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 23:18:15 +0800
Subject: [PATCH 13/51] Update LanguageManager.cs

---
 src/WPFDevelopers.Shared/LanguageManager.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/WPFDevelopers.Shared/LanguageManager.cs b/src/WPFDevelopers.Shared/LanguageManager.cs
index a14e863a..c79c450e 100644
--- a/src/WPFDevelopers.Shared/LanguageManager.cs
+++ b/src/WPFDevelopers.Shared/LanguageManager.cs
@@ -9,13 +9,29 @@ namespace WPFDevelopers
     public class LanguageManager : INotifyPropertyChanged
     {
         private readonly ResourceManager _resourceManager;
+#pragma warning disable CA1416
         private static readonly Lazy<LanguageManager> _lazy = new Lazy<LanguageManager>(() => new LanguageManager());
+#pragma warning restore CA1416
+        private CultureInfo _currentCulture;
         public static LanguageManager Instance => _lazy.Value;
         public event PropertyChangedEventHandler PropertyChanged;
+        public CultureInfo CurrentCulture
+        {
+            get => _currentCulture;
+            private set
+            {
+                if (_currentCulture != value)
+                {
+                    _currentCulture = value;
+                    OnPropertyChanged(nameof(CurrentCulture));
+                }
+            }
+        }
 
         public LanguageManager()
         {
             _resourceManager = new ResourceManager("WPFDevelopers.Languages.Language", typeof(LanguageManager).Assembly);
+            _currentCulture = Thread.CurrentThread.CurrentUICulture ?? CultureInfo.InvariantCulture;
         }
 
         public string this[string name]
@@ -34,6 +50,7 @@ public void ChangeLanguage(CultureInfo cultureInfo)
         {
             Thread.CurrentThread.CurrentCulture = cultureInfo;
             Thread.CurrentThread.CurrentUICulture = cultureInfo;
+            CurrentCulture = cultureInfo;
             OnPropertyChanged("Item[]");
         }
         protected virtual void OnPropertyChanged(string propertyName)

From 35608ef88daa8b988dc42e8e1d0785a0e0bece8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 20 Nov 2024 23:19:24 +0800
Subject: [PATCH 14/51] add Language Sample

add Language Sample
---
 .../ExampleViews/BasicControlsExample.xaml        | 15 +++++++++++++++
 .../ExampleViews/BasicControlsExample.xaml.cs     | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index f19d30d8..b216fc5c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -71,6 +71,21 @@
                             Unchecked="LightDark_Checked" />
                         <TextBlock Text="Dark" />
                     </WrapPanel>
+                    <TextBlock
+                        Margin="0,20,0,0"
+                        FontSize="20"
+                        Text="Languages" />
+                    <WrapPanel Margin="10" wd:PanelHelper.Spacing="4">
+                        <TextBlock VerticalAlignment="Center" Text="Languages:" />
+                        <ComboBox
+                            SelectedIndex="0"
+                            SelectionChanged="ComboBoxLanguages_SelectionChanged"
+                            ToolTip="目前翻译只是针对WD的自定义控件进行了多语言翻译">
+                            <ComboBoxItem Tag="zh-cn">中文</ComboBoxItem>
+                            <ComboBoxItem Tag="en-US">English</ComboBoxItem>
+                            <ComboBoxItem Tag="ko-KR">한국어</ComboBoxItem>
+                        </ComboBox>
+                    </WrapPanel>
                     <TextBlock
                         Margin="0,20,0,0"
                         FontSize="20"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
index c9563d50..9ce55f3f 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -241,5 +242,19 @@ private void ButtonNone_Click(object sender, RoutedEventArgs e)
         {
             new NoneNoChromeWindow().Show();
         }
+
+        private void ComboBoxLanguages_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var cBox = sender as ComboBox;
+            if (cBox != null)
+            {
+                var item = cBox.SelectedItem as ComboBoxItem;
+                var tag = item.Tag.ToString();
+                if (item != null && LanguageManager.Instance.CurrentCulture.Name != tag)
+                {
+                    LanguageManager.Instance.ChangeLanguage(new CultureInfo(tag));
+                }
+            }
+        }
     }
 }

From f29d4a81723af84e990287b45badf6c0fabc4706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 24 Nov 2024 17:22:40 +0800
Subject: [PATCH 15/51] Fix issue #123

Get the path after taking a screenshot and saving the file @chen2well
---
 .../ExampleViews/ScreenCutExample.xaml.cs     |  13 +++++++
 .../Controls/ScreenCut/ScreenCapture.cs       |  13 ++++++-
 .../Controls/ScreenCut/ScreenCaptureExt.cs    |  33 ++++++++++++++++--
 .../Controls/ScreenCut/ScreenCut.cs           |   6 ++++
 .../Core/Helpers/Helper.cs                    |   1 +
 .../GZ/WPFDevelopersExt.exe.gz                | Bin 27314 -> 44015 bytes
 .../Themes/ScreenCut.xaml                     |  22 ++++++------
 7 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
index 97c4a133..7ec5538c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
@@ -4,6 +4,7 @@
 using System.Windows.Controls;
 using WPFDevelopers.Controls;
 using WPFDevelopers.Controls.ScreenCapturer;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {
@@ -50,11 +51,17 @@ private void Button_Click(object sender, RoutedEventArgs e)
                 screenCapturer = new ScreenCapture();
                 screenCapturer.SnapCompleted += ScreenCapturer_SnapCompleted;
                 screenCapturer.SnapCanceled += ScreenCapturer_SnapCanceled;
+                screenCapturer.SnapSaveFullPath += ScreenCapturer_SnapSaveFullPath;
                 screenCapturer.Capture();
             }));
 
         }
 
+        private void ScreenCapturer_SnapSaveFullPath(string text)
+        {
+            WPFDevelopers.Controls.MessageBox.Show($"截图路径：{text}","Info",MessageBoxImage.Information);
+        }
+
         private void ScreenCapturer_SnapCanceled()
         {
             App.CurrentMainWindow.WindowState = WindowState.Normal;
@@ -76,6 +83,12 @@ private void ButtonExt_Click(object sender, RoutedEventArgs e)
             var screenCaptureExt = new ScreenCaptureExt();
             screenCaptureExt.SnapCanceled += ScreenCaptureExt_SnapCanceled;
             screenCaptureExt.SnapCompleted += ScreenCaptureExt_SnapCompleted;
+            screenCaptureExt.SnapSaveFullPath += ScreenCaptureExt_SnapSaveFullPath;
+        }
+
+        private void ScreenCaptureExt_SnapSaveFullPath(string text)
+        {
+            Message.Push($"截图路径：{text}", MessageBoxImage.Information);
         }
 
         private void ScreenCaptureExt_SnapCompleted(System.Windows.Media.Imaging.BitmapSource bitmap)
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs
index b59a6433..2f2fa30d 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Media.Imaging;
@@ -24,6 +25,10 @@ public class ScreenCapture
         /// </summary>
         public event ScreenShotCanceled SnapCanceled;
         /// <summary>
+        /// 获取保存的图片全路径
+        /// </summary>
+        public event Action<string> SnapSaveFullPath;
+        /// <summary>
         /// 是否将截图结果复制
         /// 默认复制
         /// </summary>
@@ -49,10 +54,16 @@ private ScreenCut CaptureScreen(int index)
             ScreenCut screenCut = new ScreenCut(index);
             screenCut.CutCompleted += ScreenCut_CutCompleted;
             screenCut.CutCanceled += ScreenCut_CutCanceled;
+            screenCut.CutFullPath += ScreenCut_CutFullPath;
             screenCut.Closed += ScreenCut_Closed;
             return screenCut;
         }
 
+        private void ScreenCut_CutFullPath(string text)
+        {
+            if(SnapSaveFullPath != null) SnapSaveFullPath(text); 
+        }
+
         private void ScreenCut_CutCanceled()
         {
             if (SnapCanceled != null) SnapCanceled();
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
index 4e14739a..b8fe61b0 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
@@ -1,15 +1,17 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
+using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Controls
 {
     public class ScreenCaptureExt : Window
     {
-        
+        private ThemeType? _theme;
         /// <summary>
         /// 截图完成委托
         /// </summary>
@@ -26,9 +28,23 @@ public class ScreenCaptureExt : Window
         /// 截图取消事件
         /// </summary>
         public event ScreenShotCanceled SnapCanceled;
+        /// <summary>
+        /// 获取保存的图片全路径
+        /// </summary>
+        public event Action<string> SnapSaveFullPath;
 
-        public ScreenCaptureExt()
+        public ScreenCaptureExt(ThemeType? themeType = null)
         {
+            if(themeType == null)
+            {
+                var existingResourceDictionary =
+               (Resources)Application.Current.Resources.MergedDictionaries.FirstOrDefault(x => x is Resources);
+                if (existingResourceDictionary != null)
+                    themeType = existingResourceDictionary.Theme;
+                else
+                    themeType = ThemeType.Dark;
+            }
+            _theme = themeType;
             Width = 0;
             Height = 0;
             Left = int.MinValue;
@@ -61,6 +77,10 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
                     if (SnapCanceled != null) 
                         SnapCanceled();
                     break;
+                case Helper.MY_MESSAGEFULLPATH:
+                    Close();
+                    GetClipboard();
+                    break;
             }
             return IntPtr.Zero;
         }
@@ -88,15 +108,22 @@ void GetClipboard()
                         SnapCompleted(bitmapImage);
                 }
             }
+            else if (Clipboard.ContainsText()) 
+            {
+                var clipboardText = Clipboard.GetText();
+                if (SnapSaveFullPath != null)
+                    SnapSaveFullPath(clipboardText);
+            }
         }
 
         void ShowScreenShot()
         {
+            string[] args = { Title, _theme.ToString() };//1.窗体tilte 2.Light或Dark
             if (Helper.GetTempPathVersionExt != null && File.Exists(Helper.GetTempPathVersionExt))
             {
                 var process = new Process();
                 process.StartInfo.FileName = Helper.GetTempPathVersionExt;
-                process.StartInfo.Arguments = Title;
+                process.StartInfo.Arguments = string.Join(" ", args);
                 process.Start();
             }
         }
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
index 83fd932e..66423bee 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
@@ -183,6 +183,10 @@ public class ScreenCut : Window, IDisposable
         /// 截图取消事件
         /// </summary>
         public event ScreenShotCanceled CutCanceled;
+        /// <summary>
+        /// 获取保存的图片全路径
+        /// </summary>
+        public event Action<string> CutFullPath;
         private double _y1;
         private int _screenIndex;
         public static int CaptureScreenID = -1;
@@ -428,6 +432,8 @@ private void ButtonSave_Click(object sender, RoutedEventArgs e)
                     fs.Dispose();
                     fs.Close();
                     Close();
+                    if (CutFullPath != null)
+                        CutFullPath(dlg.FileName);
                 }
             }
         }
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs b/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
index 9f14935a..256d0a92 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
@@ -13,6 +13,7 @@ public class Helper
     {
         public const int WM_USER = 0x03FC;
         public const int MY_MESSAGE = WM_USER + 1;
+        public const int MY_MESSAGEFULLPATH = MY_MESSAGE + 1;
         public static string GetTempPath = Path.Combine(Path.GetTempPath(), Assembly.GetExecutingAssembly().GetName().Name);
         public static string GetTempPathVersion = Path.Combine(GetTempPath, GetMD5Hash(GetCurrentDllPath()));
         public const string GetExtName = "WPFDevelopersExt.exe";
diff --git a/src/WPFDevelopers.Shared/GZ/WPFDevelopersExt.exe.gz b/src/WPFDevelopers.Shared/GZ/WPFDevelopersExt.exe.gz
index 797662bfb22da65e67504a133fcb6bf50dc82905..e1270d626784029fe586d6ac3229230a081fd6ba 100644
GIT binary patch
literal 44015
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

literal 27314
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

diff --git a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
index 3e67ad27..c3be26a1 100644
--- a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
@@ -79,7 +79,7 @@
                                     <RadioButton
                                         x:Name="PART_RadioButtonRectangle"
                                         Margin="4,0"
-                                        Style="{DynamicResource WD.PathRadioButton}"
+                                        Style="{StaticResource WD.PathRadioButton}"
                                         ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
@@ -90,7 +90,7 @@
                                     <RadioButton
                                         x:Name="PART_RadioButtonEllipse"
                                         Margin="4,0"
-                                        Style="{DynamicResource WD.PathRadioButton}"
+                                        Style="{StaticResource WD.PathRadioButton}"
                                         ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
                                         <Ellipse
                                             Width="19"
@@ -103,7 +103,7 @@
                                     <RadioButton
                                         x:Name="PART_RadioButtonArrow"
                                         Margin="4,0"
-                                        Style="{DynamicResource WD.PathRadioButton}"
+                                        Style="{StaticResource WD.PathRadioButton}"
                                         ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
@@ -114,7 +114,7 @@
                                     <RadioButton
                                         x:Name="PART_RadioButtonInk"
                                         Margin="4,0"
-                                        Style="{DynamicResource WD.PathRadioButton}"
+                                        Style="{StaticResource WD.PathRadioButton}"
                                         ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
@@ -141,7 +141,7 @@
                                     <Button
                                         x:Name="PART_ButtonSave"
                                         Margin="4,0"
-                                        Style="{DynamicResource WD.PathButton}"
+                                        Style="{StaticResource WD.PathButton}"
                                         ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
@@ -152,7 +152,7 @@
                                     <Button
                                         x:Name="PART_ButtonCancel"
                                         Margin="4,0"
-                                        Style="{DynamicResource WD.PathButton}"
+                                        Style="{StaticResource WD.PathButton}"
                                         ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="14"
@@ -163,7 +163,7 @@
                                     <Button
                                         x:Name="PART_ButtonComplete"
                                         Margin="4,0"
-                                        Style="{DynamicResource WD.PathButton}"
+                                        Style="{StaticResource WD.PathButton}"
                                         ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="20"
@@ -202,19 +202,19 @@
                                                 Margin="4,0"
                                                 Background="Red"
                                                 IsChecked="True"
-                                                Style="{DynamicResource WD.ColorRadioButton}" />
+                                                Style="{StaticResource WD.ColorRadioButton}" />
                                             <RadioButton
                                                 Margin="4,0"
                                                 Background="DodgerBlue"
-                                                Style="{DynamicResource WD.ColorRadioButton}" />
+                                                Style="{StaticResource WD.ColorRadioButton}" />
                                             <RadioButton
                                                 Margin="4,0"
                                                 Background="LimeGreen"
-                                                Style="{DynamicResource WD.ColorRadioButton}" />
+                                                Style="{StaticResource WD.ColorRadioButton}" />
                                             <RadioButton
                                                 Margin="4,0"
                                                 Background="Yellow"
-                                                Style="{DynamicResource WD.ColorRadioButton}" />
+                                                Style="{StaticResource WD.ColorRadioButton}" />
                                         </WrapPanel>
                                     </controls:SmallPanel>
                                 </Border>

From 3fbcc67dba736c1e28b28edc58d0b49cc22c4474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:25:59 +0800
Subject: [PATCH 16/51] Update Styles.Label.xaml

---
 src/WPFDevelopers.Shared/Styles/Styles.Label.xaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
index cc02bb9c..fb0b6918 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
@@ -11,8 +11,10 @@
         x:Key="WD.DefaultLabel"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type Label}">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>

From 34408a68562cf5253a7a87aeba7ec8fcca0640c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:26:23 +0800
Subject: [PATCH 17/51] Update Resources.cs

---
 src/WPFDevelopers.Shared/Resources.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/WPFDevelopers.Shared/Resources.cs b/src/WPFDevelopers.Shared/Resources.cs
index a99f389e..98499e69 100644
--- a/src/WPFDevelopers.Shared/Resources.cs
+++ b/src/WPFDevelopers.Shared/Resources.cs
@@ -12,13 +12,16 @@ namespace WPFDevelopers
     public class Resources : ResourceDictionary
     {
         public static event ThemeChangedEvent ThemeChanged;
+        private ThemeType _theme;
         public ThemeType Theme
         {
+            get => _theme;
             set => InitializeTheme(value);
         }
 
         protected void InitializeTheme(ThemeType themeType)
         {
+            _theme = themeType;
             MergedDictionaries.Clear();
             var path = GetResourceUri(GetThemeResourceName(themeType));
             MergedDictionaries.Add(new ResourceDictionary { Source = path });

From be2e9612c9c7e14d28d29da2b4715839c2e546df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:27:25 +0800
Subject: [PATCH 18/51] Update CycleLoading.cs

---
 .../Controls/Loadings/CycleLoading.cs                    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs b/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs
index e1e7bac1..9337820d 100644
--- a/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs
@@ -16,9 +16,6 @@ public class CycleLoading : LoadingBase
             DependencyProperty.Register("ValueDescription", typeof(string), typeof(CycleLoading),
                 new PropertyMetadata(default(string)));
 
-        //public static readonly DependencyProperty IsStartProperty =
-        //    DependencyProperty.Register("IsStart", typeof(bool), typeof(CycleLoading), new PropertyMetadata(true));
-
         public static readonly DependencyProperty LoadTitleProperty =
             DependencyProperty.Register("LoadTitle", typeof(string), typeof(CycleLoading),
                 new PropertyMetadata(default(string)));
@@ -47,12 +44,6 @@ internal string ValueDescription
             set => SetValue(ValueDescriptionProperty, value);
         }
 
-        //public bool IsStart
-        //{
-        //    get => (bool)GetValue(IsStartProperty);
-        //    set => SetValue(IsStartProperty, value);
-        //}
-
         public string LoadTitle
         {
             get => (string)GetValue(LoadTitleProperty);

From 4a2044c34f9722a7c322722c3634b1f1047c597c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:27:43 +0800
Subject: [PATCH 19/51] Create ScaleBase.cs

---
 .../Controls/BaseControls/ScaleBase.cs        | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/WPFDevelopers.Shared/Controls/BaseControls/ScaleBase.cs

diff --git a/src/WPFDevelopers.Shared/Controls/BaseControls/ScaleBase.cs b/src/WPFDevelopers.Shared/Controls/BaseControls/ScaleBase.cs
new file mode 100644
index 00000000..8786cb74
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/BaseControls/ScaleBase.cs
@@ -0,0 +1,96 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace WPFDevelopers.Controls
+{
+    public class ScaleBase : RangeBase//Control
+    {
+        //public static readonly DependencyProperty MaximumProperty =
+        //    DependencyProperty.Register("Maximum", typeof(double), typeof(ScaleBase), new UIPropertyMetadata(0.0, OnMaximumChanged));
+
+        //private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        //{
+        //    var ctrl = (ScaleBase)d;
+        //    ctrl.OnMaximumChanged((double)e.OldValue, (double)e.NewValue);
+        //}
+        //protected virtual void OnMaximumChanged(double oldValue, double newValue)
+        //{
+        //}
+
+        //public static readonly DependencyProperty MinimumProperty =
+        //    DependencyProperty.Register("Minimum", typeof(double), typeof(ScaleBase), new UIPropertyMetadata(0.0, OnMinimumChanged));
+
+        //private static void OnMinimumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        //{
+        //    var ctrl = (ScaleBase)d;
+        //    ctrl.OnMinimumChanged((double)e.OldValue, (double)e.NewValue);
+        //}
+        //protected virtual void OnMinimumChanged(double oldValue, double newValue)
+        //{
+        //}
+
+        //public static readonly DependencyProperty ValueProperty =
+        //    DependencyProperty.Register("Value", typeof(double), typeof(ScaleBase), new UIPropertyMetadata(0.0, OnValueChanged));
+
+        //private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        //{
+        //    var ctrl = (ScaleBase)d;
+        //    ctrl.OnValueChanged((double)e.OldValue, (double)e.NewValue);
+        //}
+        //protected virtual void OnValueChanged(double oldValue, double newValue)
+        //{
+        //}
+
+        public static readonly DependencyProperty IntervalProperty =
+            DependencyProperty.Register("Interval", typeof(double), typeof(ScaleBase), new UIPropertyMetadata(0.0, OnIntervalChanged));
+        private static void OnIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = (ScaleBase)d;
+            ctrl.OnIntervalChanged((double)e.OldValue, (double)e.NewValue);
+        }
+        protected virtual void OnIntervalChanged(double oldValue, double newValue)
+        {
+        }
+
+        public static readonly DependencyProperty GeometryProperty =
+            DependencyProperty.Register("Geometry", typeof(Geometry), typeof(ScaleBase), new PropertyMetadata(null, OnGeometryChanged));
+        private static void OnGeometryChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = (ScaleBase)d;
+            ctrl.OnGeometryChanged((Geometry)e.OldValue, (Geometry)e.NewValue);
+        }
+        protected virtual void OnGeometryChanged(Geometry oldValue, Geometry newValue)
+        {
+        }
+
+        //public double Maximum
+        //{
+        //    get => (double)GetValue(MaximumProperty);
+        //    set => SetValue(MaximumProperty, value);
+        //}
+
+        //public double Minimum
+        //{
+        //    get => (double)GetValue(MinimumProperty);
+        //    set => SetValue(MinimumProperty, value);
+        //}
+        //public double Value
+        //{
+        //    get => (double)GetValue(ValueProperty);
+        //    set => SetValue(ValueProperty, value);
+        //}
+        public double Interval
+        {
+            get => (double)GetValue(IntervalProperty);
+
+            set => SetValue(IntervalProperty, value);
+        }
+        public Geometry Geometry
+        {
+            get => (Geometry)GetValue(GeometryProperty);
+            set => SetValue(GeometryProperty, value);
+        }
+    }
+}

From 4c7adc9c178ad2a00c3b32df3ed5f1ced727b37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:27:46 +0800
Subject: [PATCH 20/51] Update Ruler.cs

---
 .../Controls/Ruler/Ruler.cs                   | 113 +++++++-----------
 1 file changed, 42 insertions(+), 71 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Ruler/Ruler.cs b/src/WPFDevelopers.Shared/Controls/Ruler/Ruler.cs
index 02ba47c6..f35f6187 100644
--- a/src/WPFDevelopers.Shared/Controls/Ruler/Ruler.cs
+++ b/src/WPFDevelopers.Shared/Controls/Ruler/Ruler.cs
@@ -1,36 +1,27 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows;
 using System.Windows.Media;
 
 namespace WPFDevelopers.Controls
 {
-    public class Ruler : Control
+    public class Ruler : ScaleBase
     {
-        public static readonly DependencyProperty IntervalProperty =
-            DependencyProperty.Register("Interval", typeof(double), typeof(Ruler), new UIPropertyMetadata(30.0));
-
-
         public static readonly DependencyProperty SpanIntervalProperty =
-            DependencyProperty.Register("SpanInterval", typeof(double), typeof(Ruler), new UIPropertyMetadata(5.0));
+            DependencyProperty.Register("SpanInterval", typeof(double), typeof(Ruler), new UIPropertyMetadata(5.0, OnSpanIntervalChanged));
 
+        private static void OnSpanIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as Ruler;
+            ctrl?.InvalidateVisual();
+        }
 
         public static readonly DependencyProperty MiddleMaskProperty =
-            DependencyProperty.Register("MiddleMask", typeof(int), typeof(Ruler), new UIPropertyMetadata(2));
-
-        public static readonly DependencyProperty CurrentValueProperty =
-            DependencyProperty.Register("CurrentValue", typeof(double), typeof(Ruler),
-                new UIPropertyMetadata(OnCurrentValueChanged));
+            DependencyProperty.Register("MiddleMask", typeof(int), typeof(Ruler), new UIPropertyMetadata(2, OnMiddleMaskChanged));
 
-        public static readonly DependencyProperty StartValueProperty =
-            DependencyProperty.Register("StartValue", typeof(double), typeof(Ruler), new UIPropertyMetadata(120.0));
-
-        public static readonly DependencyProperty EndValueProperty =
-            DependencyProperty.Register("EndValue", typeof(double), typeof(Ruler), new UIPropertyMetadata(240.0));
-
-        public static readonly DependencyProperty CurrentGeometryProperty =
-            DependencyProperty.Register("CurrentGeometry", typeof(Geometry), typeof(Ruler),
-                new PropertyMetadata(Geometry.Parse("M 257,0 257,25 264,49 250,49 257,25")));
+        private static void OnMiddleMaskChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as Ruler;
+            ctrl?.InvalidateVisual();
+        }
 
         static Ruler()
         {
@@ -39,77 +30,55 @@ static Ruler()
 
         public Ruler()
         {
+            SetValue(MaximumProperty, 240.0);
+            SetValue(MinimumProperty, 120.0);
+            SetValue(IntervalProperty, 30.0);
+            SetValue(GeometryProperty, Geometry.Parse(@"M 257,0 257,25 264,49 250,49 257,25"));
             Loaded += Ruler_Loaded;
         }
 
-        public double Interval
+        protected override void OnValueChanged(double oldValue, double newValue)
         {
-            get => (double)GetValue(IntervalProperty);
-
-            set => SetValue(IntervalProperty, value);
-        }
-
-        public double SpanInterval
-        {
-            get => (double)GetValue(SpanIntervalProperty);
-
-            set => SetValue(SpanIntervalProperty, value);
+            PaintPath();
         }
-
-        public int MiddleMask
+        protected override void OnMaximumChanged(double oldValue, double newValue)
         {
-            get => (int)GetValue(MiddleMaskProperty);
-
-            set => SetValue(MiddleMaskProperty, value);
+            InvalidateVisual();
         }
 
-        public double CurrentValue
+        protected override void OnMinimumChanged(double oldValue, double newValue)
         {
-            get => (double)GetValue(CurrentValueProperty);
-
-            set
-            {
-                SetValue(CurrentValueProperty, value);
-                PaintPath();
-            }
+            InvalidateVisual();
         }
 
-        public double StartValue
+        protected override void OnIntervalChanged(double oldValue, double newValue)
         {
-            get => (double)GetValue(StartValueProperty);
-
-            set => SetValue(StartValueProperty, value);
+            InvalidateVisual();
         }
 
-        public double EndValue
+        public double SpanInterval
         {
-            get => (double)GetValue(EndValueProperty);
+            get => (double)GetValue(SpanIntervalProperty);
 
-            set => SetValue(EndValueProperty, value);
+            set => SetValue(SpanIntervalProperty, value);
         }
 
-        public Geometry CurrentGeometry
+        public int MiddleMask
         {
-            get => (Geometry)GetValue(CurrentGeometryProperty);
-
-            set => SetValue(CurrentGeometryProperty, value);
-        }
+            get => (int)GetValue(MiddleMaskProperty);
 
-        private static void OnCurrentValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ruler = d as Ruler;
-            ruler.CurrentValue = Convert.ToDouble(e.NewValue);
+            set => SetValue(MiddleMaskProperty, value);
         }
 
         protected override void OnRender(DrawingContext drawingContext)
         {
             RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
             var nextLineValue = 0d;
-            var one_Width = ActualWidth / ((EndValue - StartValue) / Interval);
+            var one_Width = ActualWidth / ((Maximum - Minimum) / Interval);
 
-            for (var i = 0; i <= (EndValue - StartValue) / Interval; i++)
+            for (var i = 0; i <= (Maximum - Minimum) / Interval; i++)
             {
-                var numberText = DrawingContextHelper.GetFormattedText((StartValue + i * Interval).ToString(),
+                var numberText = DrawingContextHelper.GetFormattedText((Minimum + i * Interval).ToString(),
                     (Brush)DrawingContextHelper.BrushConverter.ConvertFromString("#FFFFFF"), FlowDirection.LeftToRight,
                     10);
                 drawingContext.DrawText(numberText, new Point(i * one_Width - 8, 0));
@@ -130,17 +99,19 @@ protected override void OnRender(DrawingContext drawingContext)
             }
         }
 
-        private void Ruler_Loaded(object sender, RoutedEventArgs e)
+        void Ruler_Loaded(object sender, RoutedEventArgs e)
         {
             PaintPath();
         }
 
-        private void PaintPath()
+        void PaintPath()
         {
-            var d_Value = CurrentValue - StartValue;
-            var one_Value = ActualWidth / (EndValue - StartValue);
+            if (Parent == null)
+                return;
+            var d_Value = Value - Minimum;
+            var one_Value = ActualWidth / (Maximum - Minimum);
             var x_Point = one_Value * d_Value + ((double)Parent.GetValue(ActualWidthProperty) - ActualWidth) / 2d;
-            CurrentGeometry =
+            Geometry =
                 Geometry.Parse($"M {x_Point},0 {x_Point},25 {x_Point + 7},49 {x_Point - 7},49 {x_Point},25");
         }
     }

From c043df68e5b4762063619b676b2e23e056a3b1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:27:50 +0800
Subject: [PATCH 21/51] Update Thermometer.cs

---
 .../Controls/Thermometer/Thermometer.cs       | 141 ++++++------------
 1 file changed, 46 insertions(+), 95 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Thermometer/Thermometer.cs b/src/WPFDevelopers.Shared/Controls/Thermometer/Thermometer.cs
index cc474d1e..6b0c9cc1 100644
--- a/src/WPFDevelopers.Shared/Controls/Thermometer/Thermometer.cs
+++ b/src/WPFDevelopers.Shared/Controls/Thermometer/Thermometer.cs
@@ -1,104 +1,62 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows;
 using System.Windows.Media;
 
 namespace WPFDevelopers.Controls
 {
-    public class Thermometer : Control
+    public class Thermometer : ScaleBase 
     {
-        public static readonly DependencyProperty MaxValueProperty =
-            DependencyProperty.Register("MaxValue", typeof(double), typeof(Thermometer), new UIPropertyMetadata(40.0));
-
-        public static readonly DependencyProperty MinValueProperty =
-            DependencyProperty.Register("MinValue", typeof(double), typeof(Thermometer), new UIPropertyMetadata(-10.0));
-
-        /// <summary>
-        ///     当前值
-        /// </summary>
-        public static readonly DependencyProperty CurrentValueProperty =
-            DependencyProperty.Register("CurrentValue", typeof(double), typeof(Thermometer),
-                new UIPropertyMetadata(OnCurrentValueChanged));
-
-        /// <summary>
-        ///     步长
-        /// </summary>
-        public static readonly DependencyProperty IntervalProperty =
-            DependencyProperty.Register("Interval", typeof(double), typeof(Thermometer), new UIPropertyMetadata(10.0));
-
-        /// <summary>
-        ///     当前值的图形坐标点
-        /// </summary>
-        public static readonly DependencyProperty CurrentGeometryProperty =
-            DependencyProperty.Register("CurrentGeometry", typeof(Geometry), typeof(Thermometer), new PropertyMetadata(
-                Geometry.Parse(@"M 2 132.8
-                              a 4 4 0 0 1 4 -4
-                              h 18
-                              a 4 4 0 0 1 4 4
-                              v 32.2
-                              a 4 4 0 0 1 -4 4
-                              h -18
-                              a 4 4 0 0 1 -4 -4 z")));
-
-        /// <summary>
-        ///     构造函数
-        /// </summary>
+        public new double Maximum
+        {
+            get { return base.Maximum; }
+           
+        }
+        public new double Minimum
+        {
+            get { return base.Minimum; }
+           
+        }
         static Thermometer()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Thermometer),
                 new FrameworkPropertyMetadata(typeof(Thermometer)));
         }
-
-        public double MaxValue
+        public Thermometer()
         {
-            get => (double)GetValue(MaxValueProperty);
-
-            set => SetValue(MaxValueProperty, value);
-        }
-
-        public double MinValue
-        {
-            get => (double)GetValue(MinValueProperty);
-
-            set => SetValue(MinValueProperty, value);
+            SetValue(MaximumProperty, 40.0);
+            SetValue(MinimumProperty, -10.0);
+            SetValue(IntervalProperty, 10.0);
+            SetValue(GeometryProperty, Geometry.Parse(@"M 2 132.8
+                              a 4 4 0 0 1 4 -4
+                              h 18
+                              a 4 4 0 0 1 4 4
+                              v 32.2
+                              a 4 4 0 0 1 -4 4
+                              h -18
+                              a 4 4 0 0 1 -4 -4 z"));
         }
-
-        public double CurrentValue
+        protected override void OnValueChanged(double oldValue, double newValue)
         {
-            get => (double)GetValue(CurrentValueProperty);
-
-            set
-            {
-                SetValue(CurrentValueProperty, value);
-
-                PaintPath();
-            }
+            PaintPath();
         }
 
-        public double Interval
+        protected override void OnMaximumChanged(double oldValue, double newValue)
         {
-            get => (double)GetValue(IntervalProperty);
-
-            set => SetValue(IntervalProperty, value);
+            InvalidateVisual();
         }
 
-        public Geometry CurrentGeometry
+        protected override void OnMinimumChanged(double oldValue, double newValue)
         {
-            get => (Geometry)GetValue(CurrentGeometryProperty);
-
-            set => SetValue(CurrentGeometryProperty, value);
+            InvalidateVisual();
         }
 
-        private static void OnCurrentValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        protected override void OnIntervalChanged(double oldValue, double newValue)
         {
-            var thermometer = d as Thermometer;
-            thermometer.CurrentValue = Convert.ToDouble(e.NewValue);
+            InvalidateVisual();
         }
 
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-
             PaintPath();
         }
 
@@ -168,7 +126,7 @@ protected override void OnRender(DrawingContext drawingContext)
 
             #region 画刻度
 
-            var total_Value = MaxValue - MinValue;
+            var total_Value = Maximum - Minimum;
 
             var cnt = total_Value / Interval;
 
@@ -176,14 +134,14 @@ protected override void OnRender(DrawingContext drawingContext)
 
             for (var i = 0; i <= cnt; i++)
             {
-                var formattedText = DrawingContextHelper.GetFormattedText($"{MaxValue - i * Interval}",
+                var formattedText = DrawingContextHelper.GetFormattedText($"{Maximum - i * Interval}",
                     (Brush)DrawingContextHelper.BrushConverter.ConvertFromString("#82848A"), FlowDirection.LeftToRight,
                     14D);
 
                 drawingContext.DrawText(formattedText,
                     new Point(43, i * one_value - formattedText.Height / 2d)); //减去字体高度的一半
 
-                formattedText = DrawingContextHelper.GetFormattedText($"{(MaxValue - i * Interval) * 1.8d + 32d}",
+                formattedText = DrawingContextHelper.GetFormattedText($"{(Maximum - i * Interval) * 1.8d + 32d}",
                     (Brush)DrawingContextHelper.BrushConverter.ConvertFromString("#82848A"), textSize: 14D);
 
                 drawingContext.DrawText(formattedText, new Point(-13, i * one_value - formattedText.Height / 2d));
@@ -206,25 +164,18 @@ protected override void OnRender(DrawingContext drawingContext)
         /// </summary>
         private void PaintPath()
         {
-            var one_value = 161d / ((MaxValue - MinValue) / Interval);
-
+            var one_value = 161d / ((Maximum - Minimum) / Interval);
             var width = 26d;
-
-            var height = 169d - (MaxValue - CurrentValue) * (one_value / Interval);
-
-            var x = 2d;
-
-            var y = 169d - (169d - (MaxValue - CurrentValue) * (one_value / Interval));
-
-
-            CurrentGeometry = Geometry.Parse($@"M 2 {y + 4}
-                              a 4 4 0 0 1 4 -4
-                              h {width - 8}
-                              a 4 4 0 0 1 4 4
-                              v {height - 8}
-                              a 4 4 0 0 1 -4 4
-                              h -{width - 8}
-                              a 4 4 0 0 1 -4 -4 z");
+            var height = 169d - (Maximum - Value) * (one_value / Interval);
+            var y = 169d - (169d - (Maximum - Value) * (one_value / Interval));
+            Geometry = Geometry.Parse($@"M 2 {y + 4}
+                                  a 4 4 0 0 1 4 -4
+                                  h {width - 8}
+                                  a 4 4 0 0 1 4 4
+                                  v {height - 8}
+                                  a 4 4 0 0 1 -4 4
+                                  h -{width - 8}
+                                  a 4 4 0 0 1 -4 -4 z");
         }
     }
 }
\ No newline at end of file

From efc83733fc9b9e00c2fe3a75573767ebc2359b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:27:58 +0800
Subject: [PATCH 22/51] Update ThermometerExample.xaml

---
 .../ExampleViews/ThermometerExample.xaml      | 86 ++++++++++---------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml
index f7e56d9b..1f85ef7d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml
@@ -1,52 +1,58 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.ThermometerExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.ThermometerExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <controls:CodeViewer>
 
-        <Border Background="{DynamicResource WD.BackgroundSolidColorBrush}" 
-                CornerRadius="12"
-                Width="400" Height="400"
-                Effect="{StaticResource WD.NormalShadowDepth}">
+        <Border
+            Width="400"
+            Height="400"
+            Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+            CornerRadius="12"
+            Effect="{StaticResource WD.NormalShadowDepth}">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <Slider x:Name="PART_Slider" IsSnapToTickEnabled="True"
-                Value="10"
-                Minimum="-10"
-                Maximum="40" 
-                Orientation="Vertical"
-                Height="300"/>
-                <Grid VerticalAlignment="Center"
-                      Margin="160,0,0,0">
-                    <Path Fill="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" 
-                          Stroke="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}"
-                          StrokeThickness="1" Opacity=".6"
-                          Data="{Binding ElementName=PART_Thermometer, Path=CurrentGeometry,Mode=TwoWay}"/>
-                    <wd:Thermometer x:Name="PART_Thermometer"
-                                        CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
+                <Slider
+                    x:Name="PART_Slider"
+                    Height="300"
+                    IsSnapToTickEnabled="True"
+                    Maximum="40"
+                    Minimum="-10"
+                    Orientation="Vertical"
+                    Value="10" />
+                <Grid Margin="160,0,0,0" VerticalAlignment="Center">
+                    <Path
+                        Data="{Binding ElementName=PART_Thermometer, Path=Geometry, Mode=TwoWay}"
+                        Fill="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}"
+                        Opacity=".6"
+                        Stroke="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}"
+                        StrokeThickness="1" />
+                    <wd:Thermometer x:Name="PART_Thermometer" Value="{Binding ElementName=PART_Slider, Path=Value, Mode=TwoWay}" />
                 </Grid>
-                <TextBlock Text="{Binding ElementName=PART_Thermometer,Path=CurrentValue,StringFormat={}{0}℃}" 
-                           FontSize="24" Grid.Column="1"
-                           Foreground="{DynamicResource WD.PrimaryPressedSolidColorBrush}" FontFamily="Bahnschrift"
-                           HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <TextBlock
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontFamily="Bahnschrift"
+                    FontSize="24"
+                    Foreground="{DynamicResource WD.PrimaryPressedSolidColorBrush}"
+                    Text="{Binding ElementName=PART_Thermometer, Path=Value, StringFormat={}{0}℃}" />
             </Grid>
         </Border>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThermometerExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThermometerExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThermometerExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThermometerExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From abfa577e3607dc3cc3571e14a48ae05863ccc491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:28:01 +0800
Subject: [PATCH 23/51] Update RulerControlExample.xaml.cs

---
 .../ExampleViews/RulerControlExample.xaml.cs       | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml.cs
index 04c17dd8..9decfc70 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {

From d22e92d07ebacb4a9d6fa81e65d32028453744da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:28:06 +0800
Subject: [PATCH 24/51] Update RulerControlExample.xaml

---
 .../ExampleViews/RulerControlExample.xaml     | 107 ++++++++++++------
 1 file changed, 73 insertions(+), 34 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
index b9552223..1b30541c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
@@ -1,47 +1,86 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.RulerControlExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.RulerControlExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <controls:CodeViewer>
         <Grid>
-            <Slider x:Name="PART_Slider" IsSnapToTickEnabled="True"
-                Value="40"
+            <Slider
+                x:Name="PART_Slider"
+                IsSnapToTickEnabled="True"
+                Maximum="210"
                 Minimum="10"
-                Maximum="210"/>
+                Value="40" />
+            <TextBlock
+                Margin="0,20"
+                HorizontalAlignment="Center"
+                IsHitTestVisible="False"
+                Text="{Binding ElementName=PART_Ruler, Path=Value}" />
+
             <UniformGrid Rows="3">
-                <Grid Background="{StaticResource WD.CircularDualSolidColorBrush}" Height="51" Margin="40,0">
-                    <Path Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}" StrokeThickness="1" Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
-                  Data="{Binding ElementName=PART_Ruler, Path=CurrentGeometry,Mode=TwoWay}" />
-                    <wd:Ruler x:Name="PART_Ruler" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
-                          CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
+                <Grid
+                    Height="51"
+                    Margin="40,0"
+                    Background="{StaticResource WD.CircularDualSolidColorBrush}">
+                    <Path
+                        Data="{Binding ElementName=PART_Ruler, Path=Geometry, Mode=TwoWay}"
+                        Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
+                        Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}"
+                        StrokeThickness="1" />
+                    <wd:Ruler
+                        x:Name="PART_Ruler"
+                        Margin="40,0"
+                        Interval="20"
+                        Maximum="210"
+                        Minimum="10"
+                        Value="{Binding ElementName=PART_Slider, Path=Value, Mode=TwoWay}" />
                 </Grid>
-                <Grid Background="{StaticResource WD.DangerPressedSolidColorBrush}" Height="51" Margin="40,0">
-                    <Path Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}" StrokeThickness="1" Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
-                  Data="{Binding ElementName=PART_Ruler1, Path=CurrentGeometry,Mode=TwoWay}" />
-                    <wd:Ruler x:Name="PART_Ruler1" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
-                          CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
+                <Grid
+                    Height="51"
+                    Margin="40,0"
+                    Background="{StaticResource WD.DangerPressedSolidColorBrush}">
+                    <Path
+                        Data="{Binding ElementName=PART_Ruler1, Path=Geometry, Mode=TwoWay}"
+                        Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
+                        Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}"
+                        StrokeThickness="1" />
+                    <wd:Ruler
+                        x:Name="PART_Ruler1"
+                        Margin="40,0"
+                        Interval="20"
+                        Maximum="210"
+                        Minimum="10"
+                        Value="{Binding ElementName=PART_Slider, Path=Value, Mode=TwoWay}" />
                 </Grid>
-                <Grid Background="{StaticResource WD.WarningPressedSolidColorBrush}" Height="51" Margin="40,0">
-                    <Path Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}" StrokeThickness="1" Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
-                  Data="{Binding ElementName=PART_Ruler2, Path=CurrentGeometry,Mode=TwoWay}" />
-                    <wd:Ruler x:Name="PART_Ruler2" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
-                          CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
+                <Grid
+                    Height="51"
+                    Margin="40,0"
+                    Background="{StaticResource WD.WarningPressedSolidColorBrush}">
+                    <Path
+                        Data="{Binding ElementName=PART_Ruler2, Path=Geometry, Mode=TwoWay}"
+                        Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
+                        Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}"
+                        StrokeThickness="1" />
+                    <wd:Ruler
+                        x:Name="PART_Ruler2"
+                        Margin="40,0"
+                        Interval="20"
+                        Maximum="210"
+                        Minimum="10"
+                        Value="{Binding ElementName=PART_Slider, Path=Value, Mode=TwoWay}" />
                 </Grid>
             </UniformGrid>
         </Grid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RulerControlExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RulerControlExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RulerControlExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RulerControlExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From 29e96ba74382a35d80c7945fcdb657faf8306e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:33:26 +0800
Subject: [PATCH 25/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#124=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#124 ）
---
 .../MultiSelectSearchComboBox.cs              | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
index 6fd5046e..f0cd05f6 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
@@ -79,7 +79,7 @@ public class MultiSelectionSearchComboBox : Control
 
         public static readonly DependencyProperty SelectedItemsProperty =
             DependencyProperty.Register("SelectedItems", typeof(IList), typeof(MultiSelectionSearchComboBox),
-                new FrameworkPropertyMetadata(null,
+                new FrameworkPropertyMetadata(new ArrayList(),
                     FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
                     OnSelectedItemsChanged));
 
@@ -109,37 +109,37 @@ static MultiSelectionSearchComboBox()
 
         public string Delimiter
         {
-            get => (string) GetValue(DelimiterProperty);
+            get => (string)GetValue(DelimiterProperty);
             set => SetValue(DelimiterProperty, value);
         }
 
         public string SelectedValuePath
         {
-            get => (string) GetValue(SelectedValuePathProperty);
+            get => (string)GetValue(SelectedValuePathProperty);
             set => SetValue(SelectedValuePathProperty, value);
         }
 
         public string DisplayMemberPath
         {
-            get => (string) GetValue(DisplayMemberPathProperty);
+            get => (string)GetValue(DisplayMemberPathProperty);
             set => SetValue(DisplayMemberPathProperty, value);
         }
 
         public string Text
         {
-            get => (string) GetValue(TextProperty);
+            get => (string)GetValue(TextProperty);
             set => SetValue(TextProperty, value);
         }
 
         public IEnumerable ItemsSource
         {
-            get => (IEnumerable) GetValue(ItemsSourceProperty);
+            get => (IEnumerable)GetValue(ItemsSourceProperty);
             set => SetValue(ItemsSourceProperty, value);
         }
 
         public IEnumerable ItemsSourceSearch
         {
-            get => (IEnumerable) GetValue(ItemsSourceSearchProperty);
+            get => (IEnumerable)GetValue(ItemsSourceSearchProperty);
             set => SetValue(ItemsSourceSearchProperty, value);
         }
 
@@ -151,31 +151,31 @@ public object SelectAllContent
 
         public bool IsSelectAllActive
         {
-            get => (bool) GetValue(IsSelectAllActiveProperty);
+            get => (bool)GetValue(IsSelectAllActiveProperty);
             set => SetValue(IsSelectAllActiveProperty, value);
         }
 
         public bool IsDropDownOpen
         {
-            get => (bool) GetValue(IsDropDownOpenProperty);
+            get => (bool)GetValue(IsDropDownOpenProperty);
             set => SetValue(IsDropDownOpenProperty, value);
         }
 
         public double MaxDropDownHeight
         {
-            get => (double) GetValue(MaxDropDownHeightProperty);
+            get => (double)GetValue(MaxDropDownHeightProperty);
             set => SetValue(MaxDropDownHeightProperty, value);
         }
 
         public IList SelectedItems
         {
-            get => (IList) GetValue(SelectedItemsProperty);
+            get => (IList)GetValue(SelectedItemsProperty);
             set => SetValue(SelectedItemsProperty, value);
         }
 
         public string SearchWatermark
         {
-            get => (string) GetValue(SearchWatermarkProperty);
+            get => (string)GetValue(SearchWatermarkProperty);
             set => SetValue(SearchWatermarkProperty, value);
         }
 
@@ -236,18 +236,18 @@ public override void OnApplyTemplate()
 
         private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-           SelectAllContent = LanguageManager.Instance["SelectAll"];
+            SelectAllContent = LanguageManager.Instance["SelectAll"];
         }
 
         private void OnListBoxSearch_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            if ((bool) e.NewValue)
+            if ((bool)e.NewValue)
                 UpdateIsChecked(_listBoxSearch);
         }
 
         private void OnListBox_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            if ((bool) e.NewValue)
+            if ((bool)e.NewValue)
             {
                 foreach (var item in selectedSearchList)
                     if (!_listBox.SelectedItems.Contains(item))
@@ -277,7 +277,7 @@ private void UpdateIsChecked(ListBox listBox)
 
         private void OnPopup_GotFocus(object sender, RoutedEventArgs e)
         {
-            var source = (HwndSource) PresentationSource.FromVisual(_popup.Child);
+            var source = (HwndSource)PresentationSource.FromVisual(_popup.Child);
             if (source != null)
             {
                 SetFocus(source.Handle);
@@ -356,7 +356,17 @@ private void OnListBox_SelectionChanged(object sender, SelectionChangedEventArgs
             if (e.AddedItems.Count > 0)
                 SelectionChecked(_listBox);
             Combination();
-            SelectedItems = _listBox.SelectedItems;
+            var selectedItems = _listBox.SelectedItems;
+            if (SelectedItems == null)
+                SelectedItems = selectedItems;
+            else
+            {
+                foreach (var item in selectedItems)
+                {
+                    if (!SelectedItems.Contains(item))
+                        SelectedItems.Add(item);
+                }
+            }
         }
 
         private void OnListBoxSearch_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -497,7 +507,7 @@ private static void OnIsDropDownOpenChanged(DependencyObject o, DependencyProper
         {
             var multiSelectionSearchComboBox = o as MultiSelectionSearchComboBox;
             if (multiSelectionSearchComboBox != null)
-                multiSelectionSearchComboBox.OnIsOpenChanged((bool) e.OldValue, (bool) e.NewValue);
+                multiSelectionSearchComboBox.OnIsOpenChanged((bool)e.OldValue, (bool)e.NewValue);
         }
 
         protected virtual void OnIsOpenChanged(bool oldValue, bool newValue)
@@ -516,7 +526,7 @@ private static void OnMaxDropDownHeightChanged(DependencyObject o, DependencyPro
         {
             var comboBox = o as MultiSelectionSearchComboBox;
             if (comboBox != null)
-                comboBox.OnMaxDropDownHeightChanged((double) e.OldValue, (double) e.NewValue);
+                comboBox.OnMaxDropDownHeightChanged((double)e.OldValue, (double)e.NewValue);
         }
 
         protected virtual void OnMaxDropDownHeightChanged(double oldValue, double newValue)

From 3feb946b47cbc6901d357b86d3e0db6bea3ef2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:50:14 +0800
Subject: [PATCH 26/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#116=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#116 ）
---
 .../ExampleViews/BasicControlsExample.xaml    | 66 ++++++++++++---
 .../Core/Helpers/ElementHelper.cs             |  9 ++-
 .../Styles/Styles.TabControl.xaml             | 80 ++++++++++++++++---
 3 files changed, 132 insertions(+), 23 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index b216fc5c..fccc5e44 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -779,32 +779,67 @@
                             <TabItem Padding="10" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
                         <TabControl Margin="4" TabStripPlacement="Bottom">
-                            <TabItem Padding="10" Header="TabItem1">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="1">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                x:Name="MyTabItem"
+                                MaxWidth="120"
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2LongLongLongLongLongLongLongLong"
+                                ToolTip="{Binding ElementName=MyTabItem, Path=Header}">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                MaxWidth="120"
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True">
+                                <TabItem.Header>
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        Text="TabItem3LongLongLongLongLongLongLongLong"
+                                        TextTrimming="CharacterEllipsis"
+                                        TextWrapping="NoWrap"
+                                        ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}" />
+                                </TabItem.Header>
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
                         <TabControl Margin="4" TabStripPlacement="Left">
-                            <TabItem Padding="10" Header="TabItem1">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
@@ -812,13 +847,22 @@
                             Margin="4"
                             IsEnabled="False"
                             TabStripPlacement="Right">
-                            <TabItem Padding="10" Header="TabItem1">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.SuccessSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
index f040e1ea..ea877d62 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
@@ -93,14 +93,17 @@ private static void ButtonClear_Click(object sender, RoutedEventArgs e)
             if (sender is Button button)
             {
                 if (button.TemplatedParent is TextBox textBox)
-                {
                     textBox.Clear();
-                }
                 else if (button.TemplatedParent is PasswordBox passwordBox)
-                {
                     passwordBox.Clear();
+                else if (button.TemplatedParent is TabItem tabItem)
+                {
+                    var tabControl = tabItem.Parent as TabControl;
+                    if (tabControl != null)
+                        tabControl.Items.Remove(tabItem); 
                 }
             }
         }
+        
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
index 03820288..b0983557 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
@@ -2,7 +2,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
+    xmlns:resx="clr-namespace:WPFDevelopers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
@@ -19,15 +20,52 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                    <controls:SmallPanel
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Background="{TemplateBinding Background}">
                         <Border x:Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" />
-                        <ContentPresenter
-                            x:Name="PART_ContentPresenter"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                            VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                            ContentSource="Header"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter
+                                x:Name="PART_ContentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                ContentSource="Header"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <Button
+                                x:Name="PART_CloseButton"
+                                Grid.Column="1"
+                                Width="20"
+                                Height="20"
+                                Margin="0,0,4,0"
+                                helpers:ElementHelper.CornerRadius="4"
+                                helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource WD.NormalButton}"
+                                ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}"
+                                Visibility="Collapsed">
+                                <controls:PathIcon
+                                    Width="10"
+                                    Height="10"
+                                    Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}"
+                                    Kind="WindowClose" />
+                            </Button>
+                        </Grid>
+                        <!--<Line
+                            x:Name="PART_Line"
+                            Margin="{TemplateBinding Margin}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Stroke="{DynamicResource WD.SecondaryTextSolidColorBrush}"
+                            StrokeThickness="1"
+                            X1="2"
+                            X2="2"
+                            Y1="0"
+                            Y2="15" />-->
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
@@ -38,6 +76,28 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                         </Trigger>
+                        <Trigger Property="helpers:ElementHelper.IsClear" Value="True">
+                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <!--<Trigger Property="TabStripPlacement" Value="Left">
+                            <Setter TargetName="PART_Line" Property="X1" Value="0" />
+                            <Setter TargetName="PART_Line" Property="X2" Value="15" />
+                            <Setter TargetName="PART_Line" Property="Y1" Value="2" />
+                            <Setter TargetName="PART_Line" Property="Y2" Value="2" />
+                            <Setter TargetName="PART_Line" Property="VerticalAlignment" Value="Bottom" />
+                            <Setter TargetName="PART_Line" Property="HorizontalAlignment" Value="Center" />
+                        </Trigger>
+                        <Trigger Property="TabStripPlacement" Value="Right">
+                            <Setter TargetName="PART_Line" Property="X1" Value="0" />
+                            <Setter TargetName="PART_Line" Property="X2" Value="15" />
+                            <Setter TargetName="PART_Line" Property="Y1" Value="2" />
+                            <Setter TargetName="PART_Line" Property="Y2" Value="2" />
+                            <Setter TargetName="PART_Line" Property="VerticalAlignment" Value="Bottom" />
+                            <Setter TargetName="PART_Line" Property="HorizontalAlignment" Value="Center" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Line" Property="Visibility" Value="Collapsed" />
+                        </Trigger>-->
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -85,6 +145,8 @@
                 <ControlTemplate TargetType="{x:Type TabControl}">
                     <controls:WDBorder
                         x:Name="PART_Border"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
                         Margin="{TemplateBinding Margin}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"

From 0f419d49011d26efdfa57bc3e6972e6525f61309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:51:05 +0800
Subject: [PATCH 27/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#124=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#124 ）
---
 .../MultiSelectSearchComboBoxExample.xaml     | 137 ++++++++++--------
 .../MultiSelectSearchComboBoxExample.xaml.cs  |  42 +++++-
 2 files changed, 111 insertions(+), 68 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
index c2b57c91..accea93d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
@@ -16,66 +16,83 @@
         <model:HospitalList x:Key="myHospitalList" />
     </UserControl.Resources>
     <controls:CodeViewer>
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Button
-                Margin="0,20,0,0"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Bottom"
-                Click="Button_Click"
-                Content="获取选中"
-                Style="{StaticResource WD.SuccessPrimaryButton}" />
-            <UniformGrid
-                Grid.Row="1"
-                wd:PanelHelper.Spacing="4"
-                Columns="2"
-                Rows="2">
-                <wd:MultiSelectionSearchComboBox
-                    Width="200"
-                    Height="38"
-                    Delimiter=","
-                    DisplayMemberPath="Number"
-                    IsSelectAllActive="True"
-                    ItemsSource="{Binding Drawings}"
-                    SelectedValuePath="Index">
-                    <wd:MultiSelectionSearchComboBox.DataContext>
-                        <vm:DrawingExampleVM />
-                    </wd:MultiSelectionSearchComboBox.DataContext>
-                </wd:MultiSelectionSearchComboBox>
-                <wd:MultiSelectionSearchComboBox
-                    Width="200"
-                    wd:ElementHelper.Watermark="MultiSelectionSearchComboBox"
-                    Delimiter="^"
-                    DisplayMemberPath="Number"
-                    IsSelectAllActive="True"
-                    ItemsSource="{Binding Drawings}"
-                    SearchWatermark="请输入搜索内容"
-                    SelectedValuePath="Index">
-                    <wd:MultiSelectionSearchComboBox.DataContext>
-                        <vm:DrawingExampleVM />
-                    </wd:MultiSelectionSearchComboBox.DataContext>
-                </wd:MultiSelectionSearchComboBox>
-                <wd:MultiSelectionSearchComboBox
-                    Name="MyMultiSelectionSearchComboBox2"
-                    Width="200"
-                    Height="38"
-                    wd:ElementHelper.Watermark="下拉多选搜索"
-                    Delimiter="^"
-                    IsSelectAllActive="True"
-                    SearchWatermark="请输入搜索内容" />
-                <wd:MultiSelectionSearchComboBox
-                    Name="MyMultiSelectionSearchComboBox3"
-                    Width="200"
-                    Height="38"
-                    wd:ElementHelper.CornerRadius="3"
-                    Delimiter=","
-                    DisplayMemberPath="Name"
-                    SelectedValuePath="ID" />
-            </UniformGrid>
-        </Grid>
+        <UniformGrid
+            wd:PanelHelper.Spacing="4"
+            Columns="2"
+            Rows="2">
+            <wd:MultiSelectionSearchComboBox
+                Width="200"
+                Height="38"
+                Delimiter=","
+                DisplayMemberPath="Number"
+                IsSelectAllActive="True"
+                ItemsSource="{Binding Drawings}"
+                SelectedValuePath="Index">
+                <wd:MultiSelectionSearchComboBox.DataContext>
+                    <vm:DrawingExampleVM />
+                </wd:MultiSelectionSearchComboBox.DataContext>
+            </wd:MultiSelectionSearchComboBox>
+            <wd:MultiSelectionSearchComboBox
+                Width="200"
+                wd:ElementHelper.Watermark="MultiSelectionSearchComboBox"
+                Delimiter="^"
+                DisplayMemberPath="Number"
+                IsSelectAllActive="True"
+                ItemsSource="{Binding Drawings}"
+                SearchWatermark="请输入搜索内容"
+                SelectedValuePath="Index">
+                <wd:MultiSelectionSearchComboBox.DataContext>
+                    <vm:DrawingExampleVM />
+                </wd:MultiSelectionSearchComboBox.DataContext>
+            </wd:MultiSelectionSearchComboBox>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <StackPanel
+                    HorizontalAlignment="Center"
+                    wd:PanelHelper.Spacing="5"
+                    Orientation="Horizontal">
+                    <Button
+                        Click="Button_Click"
+                        Content="获取选中"
+                        Style="{StaticResource WD.SuccessPrimaryButton}" />
+                    <Button
+                        wd:ElementHelper.CornerRadius="3"
+                        Click="BtnAdd_Click"
+                        Content="Add Item"
+                        Style="{StaticResource WD.SuccessPrimaryButton}" />
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    wd:PanelHelper.Spacing="3"
+                    Orientation="Horizontal">
+                    <TextBlock VerticalAlignment="Center" Text="Binding:" />
+                    <wd:MultiSelectionSearchComboBox
+                        Name="MyMultiSelectionSearchComboBox2"
+                        wd:ElementHelper.Watermark="下拉多选搜索"
+                        Delimiter="^"
+                        DisplayMemberPath="Name"
+                        IsSelectAllActive="True"
+                        ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource AncestorType=local:MultiSelectSearchComboBoxExample}}"
+                        SearchWatermark="请输入搜索内容"
+                        SelectedItems="{Binding SelectedItems, RelativeSource={RelativeSource AncestorType=local:MultiSelectSearchComboBoxExample}}"
+                        SelectedValuePath="ID" />
+                </StackPanel>
+            </Grid>
+
+            <wd:MultiSelectionSearchComboBox
+                Name="MyMultiSelectionSearchComboBox3"
+                Width="200"
+                Height="38"
+                wd:ElementHelper.CornerRadius="3"
+                Delimiter=","
+                DisplayMemberPath="Name"
+                SelectedValuePath="ID" />
+        </UniformGrid>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MultiSelectSearchComboBoxExample.xaml" CodeType="Xaml" />
             <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs" CodeType="CSharp" />
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
index e31d6848..419d53fc 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
@@ -1,5 +1,5 @@
-using ICSharpCode.AvalonEdit.Document;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -11,6 +11,24 @@ namespace WPFDevelopers.Samples.ExampleViews
     /// </summary>
     public partial class MultiSelectSearchComboBoxExample : UserControl
     {
+        public ObservableCollection<UserInfo> SelectedItems
+        {
+            get { return (ObservableCollection<UserInfo>)GetValue(SelectedItemsProperty); }
+            set { SetValue(SelectedItemsProperty, value); }
+        }
+
+        public static readonly DependencyProperty SelectedItemsProperty =
+            DependencyProperty.Register("SelectedItems", typeof(ObservableCollection<UserInfo>), typeof(MultiSelectSearchComboBoxExample), new PropertyMetadata(null));
+
+        public ObservableCollection<UserInfo> ItemsSource
+        {
+            get { return (ObservableCollection<UserInfo>)GetValue(ItemsSourceProperty); }
+            set { SetValue(ItemsSourceProperty, value); }
+        }
+
+        public static readonly DependencyProperty ItemsSourceProperty =
+            DependencyProperty.Register("ItemsSource", typeof(ObservableCollection<UserInfo>), typeof(MultiSelectSearchComboBoxExample), new PropertyMetadata(null));
+
         public MultiSelectSearchComboBoxExample()
         {
             InitializeComponent();
@@ -19,11 +37,11 @@ public MultiSelectSearchComboBoxExample()
 
         private void MultiSelectSearchComboBoxExample_Loaded(object sender, RoutedEventArgs e)
         {
-            var list = new List<string>();
-            for (int i = 0; i < 10; i++)
-                list.Add(i.ToString());
-            MyMultiSelectionSearchComboBox2.ItemsSource = list;
-            MyMultiSelectionSearchComboBox2.SelectedItems = list.Skip(3).ToList();
+            //var list = new List<string>();
+            //for (int i = 0; i < 10; i++)
+            //    list.Add(i.ToString());
+            //MyMultiSelectionSearchComboBox2.ItemsSource = list;
+            //MyMultiSelectionSearchComboBox2.SelectedItems = list.Skip(3).ToList();
 
             var list2 = new List<UserInfo>();
             list2.Add(new UserInfo() { ID = "0", Name = "343DST.com" });
@@ -32,11 +50,19 @@ private void MultiSelectSearchComboBoxExample_Loaded(object sender, RoutedEventA
             list2.Add(new UserInfo() { ID = "3", Name = "josh.peng" });
             MyMultiSelectionSearchComboBox3.ItemsSource = list2;
             MyMultiSelectionSearchComboBox3.SelectedItems = list2.Where(x => x.ID == "1" || x.ID == "3").ToList();
+
+            ItemsSource = new ObservableCollection<UserInfo>(list2);
+            SelectedItems = new ObservableCollection<UserInfo>(list2.Where(x => x.ID == "1" || x.ID == "3"));
         }
 
         private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
         {
-            WPFDevelopers.Controls.MessageBox.Show($"{MyMultiSelectionSearchComboBox2.Text} \r\n总共选中:{MyMultiSelectionSearchComboBox2.SelectedItems.Count} 条","选中内容",MessageBoxButton.OK,MessageBoxImage.Information);      
+            WPFDevelopers.Controls.MessageBox.Show($"{MyMultiSelectionSearchComboBox2.Text} \r\n总共选中:{SelectedItems.Count} 条", "选中内容", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        private void BtnAdd_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            ItemsSource.Add(new UserInfo() { ID = "4", Name = "OpenAI.com" });
         }
     }
     public class UserInfo

From 57318aedcce10a99faed0b22cd6556128a30d2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:51:16 +0800
Subject: [PATCH 28/51] Update ControlsHelper.cs

---
 .../Core/Helpers/ControlsHelper.cs            | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
index 1748c7c6..3c3df174 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
@@ -88,7 +88,7 @@ public static void ThemeRefresh()
         public static void WindowShake(Window window = null)
         {
             if (window == null)
-                if (Application.Current.Windows.Count > 0)
+                if (Application.Current != null && Application.Current.Windows.Count > 0)
                     window = Application.Current.Windows.OfType<Window>().FirstOrDefault(o => o.IsActive);
 
             var doubleAnimation = new DoubleAnimation
@@ -155,22 +155,26 @@ public static BitmapSource Capture()
             }
             return null;
         }
+       
         public static AdornerLayer GetAdornerLayer(Visual visual)
         {
-            var decorator = visual as AdornerDecorator;
-            if (decorator != null)
+            if (visual == null) return null;  
+            if (visual is AdornerDecorator decorator)
                 return decorator.AdornerLayer;
-            var presenter = visual as ScrollContentPresenter;
-            if (presenter != null)
+            if (visual is ScrollContentPresenter presenter)
                 return presenter.AdornerLayer;
-            var visualContent = (visual as Window)?.Content as Visual;
-            return AdornerLayer.GetAdornerLayer(visualContent ?? visual);
+            if (visual is Window window)
+            {
+                var visualContent = window.Content as Visual;
+                return AdornerLayer.GetAdornerLayer(visualContent ?? visual);
+            }
+            return AdornerLayer.GetAdornerLayer(visual);
         }
 
         public static Window GetDefaultWindow()
         {
             Window window = null;
-            if (Application.Current.Windows.Count > 0)
+            if (Application.Current != null && Application.Current.Windows.Count > 0)
             {
                 window = Application.Current.Windows.OfType<Window>().FirstOrDefault(o => o.IsActive);
                 if (window == null)

From 1925d21048b461feffc621ade28f70ccaf27758f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:51:23 +0800
Subject: [PATCH 29/51] Update MultiSelectComboBoxExample.xaml

---
 .../ExampleViews/MultiSelectComboBoxExample.xaml                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
index a9e3b38a..bdde174d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
@@ -35,6 +35,7 @@
                 <wd:MultiSelectComboBox
                     Width="200"
                     HorizontalAlignment="Center"
+                    wd:ElementHelper.Watermark="请选择内容"
                     Delimiter="^"
                     IsSelectAllActive="True">
                     <wd:MultiSelectComboBoxItem>Option 1</wd:MultiSelectComboBoxItem>

From 01d2fe637d24be6d10f286491404ab0e1dcda3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:52:04 +0800
Subject: [PATCH 30/51] Update MultiSelectSearchComboBox.xaml

---
 .../Themes/MultiSelectSearchComboBox.xaml                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
index cfa3b5ce..d7a7df3d 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
@@ -62,7 +62,7 @@
                             </Grid.ColumnDefinitions>
                             <TextBox
                                 Name="PART_EditableTextBox"
-                                Margin="{TemplateBinding Padding}"
+                                Padding="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Panel.ZIndex="1"
@@ -76,7 +76,7 @@
                                 Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
                             <TextBlock
                                 x:Name="PART_Watermark"
-                                Margin="{TemplateBinding Padding}"
+                                Padding="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Background="Transparent"

From 0e13e487cc6005ffe72db8384c6900c96e36d167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:52:07 +0800
Subject: [PATCH 31/51] Update MultiSelectComboBox.xaml

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

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
index 4e9ede24..130fde9c 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
@@ -112,7 +112,7 @@
                             </Grid.ColumnDefinitions>
                             <TextBox
                                 Name="PART_EditableTextBox"
-                                Margin="{TemplateBinding Padding}"
+                                Padding="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Panel.ZIndex="1"
@@ -126,7 +126,7 @@
                                 Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
                             <TextBlock
                                 x:Name="PART_Watermark"
-                                Margin="{TemplateBinding Padding}"
+                                Padding="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Background="Transparent"

From 14aed352b61e93cc9778ea703cd9668a7c1f3e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:52:12 +0800
Subject: [PATCH 32/51] Update WPFDevelopers.Shared.projitems

---
 src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index ac1fe254..69a92056 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -9,6 +9,7 @@
     <Import_RootNamespace>WPFDevelopers</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseControls\ScaleBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseControls\SliderRepeatButton.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseControls\WDBorder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartBase.cs" />

From ca59e416edb366a5040061cd590c5de992762da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 8 Dec 2024 21:26:56 +0800
Subject: [PATCH 33/51] Update Styles.TabControl.xaml

---
 src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
index b0983557..50983671 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
@@ -147,7 +147,6 @@
                         x:Name="PART_Border"
                         Width="{TemplateBinding Width}"
                         Height="{TemplateBinding Height}"
-                        Margin="{TemplateBinding Margin}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"

From 83e7c06c3a04c0b6ba845acc8364c9eef383f594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 8 Dec 2024 21:27:35 +0800
Subject: [PATCH 34/51] =?UTF-8?q?Fix=20issue=EF=BC=88=20#126=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue（ #126 ）
---
 .../Styles/Styles.GroupBox.xaml                 | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
index 00b3390d..b0cda945 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
@@ -12,36 +12,43 @@
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type GroupBox}">
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-        <Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
-                    <Grid Margin="{TemplateBinding Margin}">
+                    <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <Border
-                            Background="{TemplateBinding Background}"
+                            Background="{DynamicResource WD.LighterSolidColorBrush}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}"
                             SnapsToDevicePixels="True">
                             <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
-                                VerticalAlignment="Center"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 ContentSource="Header"
                                 RecognizesAccessKey="True" />
                         </Border>
                         <Border
                             Grid.Row="1"
+                            Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="1,0,1,1"
                             CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}"
                             SnapsToDevicePixels="True">
-                            <ContentPresenter Margin="{TemplateBinding Padding}" />
+                            <ContentPresenter
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}" />
                         </Border>
                     </Grid>
                 </ControlTemplate>

From 721a35d791de89ccbacc88298b80fb1a7be02e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 8 Dec 2024 21:28:07 +0800
Subject: [PATCH 35/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#126=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#126 ）
---
 .../ExampleViews/BasicControlsExample.xaml    | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index fccc5e44..644fae3f 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -753,16 +753,27 @@
                         Text="GroupBox" />
                     <UniformGrid Margin="0,10" Columns="2">
                         <GroupBox wd:ElementHelper.CornerRadius="3" Header="GroupBox1">
-                            <Rectangle
+                            <Grid wd:PanelHelper.Spacing="2">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Text="TextBlock:" />
+                                <Button Grid.Column="1" Content="Commit" />
+                            </Grid>
+                            <!--<Rectangle
                                 Width="400"
                                 Height="300"
-                                Fill="{DynamicResource WD.DangerSolidColorBrush}" />
+                                Fill="{DynamicResource WD.DangerSolidColorBrush}" />-->
                         </GroupBox>
-                        <GroupBox Margin="10,0" Header="GroupBox1">
-                            <Rectangle
-                                Width="400"
-                                Height="300"
-                                Fill="{DynamicResource WD.LightSolidColorBrush}" />
+                        <GroupBox
+                            Height="400"
+                            Margin="10,0"
+                            Header="GroupBox1">
+                            <Rectangle Fill="{DynamicResource WD.LightSolidColorBrush}" />
                         </GroupBox>
                     </UniformGrid>
 
@@ -793,10 +804,7 @@
                             </TabItem>
                         </TabControl>
                         <TabControl Margin="4" TabStripPlacement="Bottom">
-                            <TabItem
-                                Padding="10"
-                                wd:ElementHelper.IsClear="True"
-                                Header="1">
+                            <TabItem Padding="10" Header="Home">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
                             <TabItem

From 3fda4b8883587969262ffa9d3be965a1e391581d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 17:19:40 +0800
Subject: [PATCH 36/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#125=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#125 ）
---
 .../ExampleViews/MessageExample.xaml          | 114 +++++++++++++-----
 .../ExampleViews/MessageExample.xaml.cs       |  45 ++++++-
 .../Controls/Message/Message.cs               |  66 ++++++++--
 .../Controls/Message/MessageAdorner.cs        |  43 +++++--
 .../Controls/Message/MessageExt.cs            |  75 ++++++++++++
 src/WPFDevelopers.Shared/Themes/Message.xaml  |   6 +-
 .../WPFDevelopers.Shared.projitems            |   1 +
 7 files changed, 291 insertions(+), 59 deletions(-)
 create mode 100644 src/WPFDevelopers.Shared/Controls/Message/MessageExt.cs

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml
index 1ffce860..d65b3c93 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml
@@ -11,37 +11,89 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <UniformGrid
-            Height="38"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Bottom"
-            Rows="1">
-            <Button
-                Click="AddButton_Click"
-                Content="Info Message"
-                Style="{StaticResource WD.SuccessPrimaryButton}"
-                Tag="Info" />
-            <Button
-                Click="AddButton_Click"
-                Content="Error Message"
-                Style="{StaticResource WD.DangerPrimaryButton}"
-                Tag="Error" />
-            <Button
-                Click="AddButton_Click"
-                Content="Warning Message"
-                Style="{StaticResource WD.WarningPrimaryButton}"
-                Tag="Warning" />
-            <Button
-                Click="AddButton_Click"
-                Content="Question Message"
-                Style="{StaticResource WD.PrimaryButton}"
-                Tag="Question" />
-            <Button
-                Click="AddButton_Click"
-                Content="Long Message"
-                Style="{StaticResource WD.SuccessPrimaryButton}"
-                Tag="Long" />
-        </UniformGrid>
+        <StackPanel wd:PanelHelper.Spacing="2">
+            <GroupBox Header="Message Position">
+                <WrapPanel HorizontalAlignment="Center">
+                    <RadioButton Checked="RadioButton_Checked" Content="Left" />
+                    <RadioButton
+                        Checked="RadioButton_Checked"
+                        Content="Top"
+                        IsChecked="True" />
+                    <RadioButton Checked="RadioButton_Checked" Content="Right" />
+                    <RadioButton Checked="RadioButton_Checked" Content="Bottom" />
+                </WrapPanel>
+            </GroupBox>
+            <GroupBox Header="Window">
+                <UniformGrid
+                    Height="38"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    wd:PanelHelper.Spacing="2"
+                    Rows="1">
+                    <Button
+                        Click="AddButton_Click"
+                        Content="Info Message"
+                        Style="{StaticResource WD.SuccessPrimaryButton}"
+                        Tag="Info" />
+                    <Button
+                        Click="AddButton_Click"
+                        Content="Error Message"
+                        Style="{StaticResource WD.DangerPrimaryButton}"
+                        Tag="Error" />
+                    <Button
+                        Click="AddButton_Click"
+                        Content="Warning Message"
+                        Style="{StaticResource WD.WarningPrimaryButton}"
+                        Tag="Warning" />
+                    <Button
+                        Click="AddButton_Click"
+                        Content="Question Message"
+                        Style="{StaticResource WD.PrimaryButton}"
+                        Tag="Question" />
+                    <Button
+                        Click="AddButton_Click"
+                        Content="Long Message"
+                        Style="{StaticResource WD.SuccessPrimaryButton}"
+                        Tag="Long" />
+                    <Button Click="BtnClear_Click" Content="Clear" />
+                </UniformGrid>
+            </GroupBox>
+            <GroupBox Header="Desktop">
+                <UniformGrid
+                    Height="38"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    wd:PanelHelper.Spacing="2"
+                    Rows="1">
+                    <Button
+                        Click="AddButtonDesktop_Click"
+                        Content="Info Message"
+                        Style="{StaticResource WD.SuccessPrimaryButton}"
+                        Tag="Info" />
+                    <Button
+                        Click="AddButtonDesktop_Click"
+                        Content="Error Message"
+                        Style="{StaticResource WD.DangerPrimaryButton}"
+                        Tag="Error" />
+                    <Button
+                        Click="AddButtonDesktop_Click"
+                        Content="Warning Message"
+                        Style="{StaticResource WD.WarningPrimaryButton}"
+                        Tag="Warning" />
+                    <Button
+                        Click="AddButtonDesktop_Click"
+                        Content="Question Message"
+                        Style="{StaticResource WD.PrimaryButton}"
+                        Tag="Question" />
+                    <Button
+                        Click="AddButtonDesktop_Click"
+                        Content="Long Message"
+                        Style="{StaticResource WD.SuccessPrimaryButton}"
+                        Tag="Long" />
+                    <Button Click="BtnDesktopClear_Click" Content="Clear" />
+                </UniformGrid>
+            </GroupBox>
+        </StackPanel>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MessageExample.xaml" CodeType="Xaml" />
             <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MessageExample.xaml.cs" CodeType="CSharp" />
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml.cs
index 3036cbe9..3d604e0f 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using WPFDevelopers.Controls;
 
@@ -12,6 +13,17 @@ public partial class MessageExample : UserControl
         public MessageExample()
         {
             InitializeComponent();
+           
+        }
+
+        private void RadioButton_Checked(object sender, RoutedEventArgs e)
+        {
+            var radioButton = sender as RadioButton;
+            if (radioButton != null)
+            {
+                if (Enum.TryParse(radioButton.Content.ToString(), out Position position))
+                    Message.SetPosition(position);
+            }
         }
         private void AddButton_Click(object sender, RoutedEventArgs e)
         {
@@ -34,7 +46,38 @@ private void AddButton_Click(object sender, RoutedEventArgs e)
                     Message.Push("这是一条很长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长消息", MessageBoxImage.Information);
                     break;
             }
+        }
+        private void BtnClear_Click(object sender, RoutedEventArgs e)
+        {
+            Message.Clear();
+        }
+        private void BtnDesktopClear_Click(object sender, RoutedEventArgs e)
+        {
+            Message.ClearDesktop();
+        }
+        
 
+        private void AddButtonDesktop_Click(object sender, RoutedEventArgs e)
+        {
+            var btn = sender as Button;
+            switch (btn.Tag)
+            {
+                case "Info":
+                    Message.PushDesktop("This is a info message", MessageBoxImage.Information);
+                    break;
+                case "Error":
+                    Message.PushDesktop("This is a error message", MessageBoxImage.Error, true);
+                    break;
+                case "Warning":
+                    Message.PushDesktop("This is a warning message", MessageBoxImage.Warning, true);
+                    break;
+                case "Question":
+                    Message.PushDesktop("This is a question message", MessageBoxImage.Question);
+                    break;
+                default:
+                    Message.PushDesktop("这是一条很长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长消息", MessageBoxImage.Information);
+                    break;
+            }
         }
     }
 }
diff --git a/src/WPFDevelopers.Shared/Controls/Message/Message.cs b/src/WPFDevelopers.Shared/Controls/Message/Message.cs
index 7852c295..a707e1a2 100644
--- a/src/WPFDevelopers.Shared/Controls/Message/Message.cs
+++ b/src/WPFDevelopers.Shared/Controls/Message/Message.cs
@@ -1,30 +1,40 @@
 using System;
 using System.Windows;
 using WPFDevelopers.Helpers;
+using System.Windows.Media;
 
 namespace WPFDevelopers.Controls
 {
     public static class Message
     {
-        private static MessageAdorner messageAdorner;
+        private static MessageAdorner _messageAdorner;
+        private static MessageExt _messageExt;
+        private static Position _position;
 
         static void CreateMessageAdorner(Window owner = null, string message = null, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
         {
             try
             {
-                if (messageAdorner != null)
+                if (_messageAdorner != null)
                 {
-                    messageAdorner.Push(message, type, center);
-                    return;
+                    if (_messageAdorner.Position != _position)
+                        _messageAdorner.Position = _position;
+                    _messageAdorner.Push(message, type, center);
+                }
+                else
+                {
+                    if (owner == null)
+                        owner = ControlsHelper.GetDefaultWindow();
+                    var layer = ControlsHelper.GetAdornerLayer(owner);
+                    if (layer == null)
+                        throw new Exception("AdornerLayer is not empty, it is recommended to use PushDesktop");
+                    _messageAdorner = new MessageAdorner(layer);
+                    layer.Add(_messageAdorner);
+                    if (_messageAdorner.Position != _position)
+                        _messageAdorner.Position = _position;
+                    if (!string.IsNullOrWhiteSpace(message))
+                        _messageAdorner.Push(message, type, center);
                 }
-                if (owner == null)
-                    owner = ControlsHelper.GetDefaultWindow();
-                var layer = ControlsHelper.GetAdornerLayer(owner);
-                if (layer == null)
-                    throw new Exception("not AdornerLayer is null");
-                messageAdorner = new MessageAdorner(layer);
-                layer.Add(messageAdorner);
-                messageAdorner.Push(message, type, center);
             }
             catch (Exception)
             {
@@ -39,5 +49,37 @@ public static void Push(string message, MessageBoxImage type = MessageBoxImage.I
         {
             CreateMessageAdorner(message: message, type: type, center: center);
         }
+
+        public static void PushDesktop(string message, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
+        {
+            if (_messageExt == null)
+            {
+                _messageExt = new MessageExt();
+                _messageExt.Closed += delegate { _messageExt = null; };
+            }
+            if (!_messageExt.IsVisible)
+                _messageExt.Show();
+            if (_messageExt.Position != _position)
+            {
+                _messageExt.IsPosition = false;
+                _messageExt.Position = _position;
+            }
+            _messageExt.Push(message, type, center); 
+        }
+        public static void SetPosition(Position position = Position.Top)
+        {
+            if (_position != position)
+                _position = position;
+        }
+        public static void Clear()
+        {
+            if(_messageAdorner != null)
+                _messageAdorner.Clear();
+        }
+        public static void ClearDesktop()
+        {
+            if (_messageExt != null)
+                _messageExt.Clear();
+        }
     }
 }
diff --git a/src/WPFDevelopers.Shared/Controls/Message/MessageAdorner.cs b/src/WPFDevelopers.Shared/Controls/Message/MessageAdorner.cs
index e9167ff8..fae377a6 100644
--- a/src/WPFDevelopers.Shared/Controls/Message/MessageAdorner.cs
+++ b/src/WPFDevelopers.Shared/Controls/Message/MessageAdorner.cs
@@ -6,23 +6,28 @@ namespace WPFDevelopers.Controls
 {
     public class MessageAdorner : Adorner
     {
-        private MessageListBox listBox;
+        private MessageListBox _listBox;
         private UIElement _child;
-        private FrameworkElement adornedElement;
+        private FrameworkElement _adornedElement;
+        internal Position Position;
         public MessageAdorner(UIElement adornedElement) : base(adornedElement)
         {
-            this.adornedElement = adornedElement as FrameworkElement;
+            _adornedElement = adornedElement as FrameworkElement;
         }
-
-        public void Push(string message, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
+        internal void Push(string message, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
         {
-            if (listBox == null)
+            if (_listBox == null)
             {
-                listBox = new MessageListBox();
-                Child = listBox;
+                _listBox = new MessageListBox();
+                Child = _listBox;
             }
             var mItem = new MessageListBoxItem { Content = message, MessageType = type, IsCenter = center };
-            listBox.Items.Insert(0, mItem);
+            _listBox.Items.Insert(0, mItem);
+        }
+        internal void Clear()
+        {
+            if(_listBox != null)
+                _listBox.Items.Clear();
         }
         public UIElement Child
         {
@@ -49,8 +54,24 @@ protected override int VisualChildrenCount
 
         protected override Size ArrangeOverride(Size finalSize)
         {
-            var x = (adornedElement.ActualWidth - _child.DesiredSize.Width) / 2;
-            _child.Arrange(new Rect(new Point(x, 0), _child.DesiredSize));
+            if (_child == null)
+                return finalSize;
+            double x = 0;
+            double y = 0;
+            switch (Position)
+            {
+                case Position.Top:
+                    x = (_adornedElement.ActualWidth - _child.DesiredSize.Width) / 2;
+                    break;
+                case Position.Right:
+                    x = _adornedElement.ActualWidth - _child.DesiredSize.Width;
+                    break;
+                case Position.Bottom:
+                    x = (_adornedElement.ActualWidth - _child.DesiredSize.Width) / 2;
+                    y = _adornedElement.ActualHeight - _child.DesiredSize.Height;
+                    break;
+            }
+            _child.Arrange(new Rect(new Point(x, y), _child.DesiredSize));
             return finalSize;
         }
 
diff --git a/src/WPFDevelopers.Shared/Controls/Message/MessageExt.cs b/src/WPFDevelopers.Shared/Controls/Message/MessageExt.cs
new file mode 100644
index 00000000..91ed284b
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Message/MessageExt.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace WPFDevelopers.Controls
+{
+    public sealed class MessageExt : Window
+    {
+        private MessageListBox _listBox;
+        internal bool IsPosition;
+        internal Position Position;
+
+        public MessageExt()
+        {
+            SizeToContent = SizeToContent.Width;
+            ResizeMode = ResizeMode.NoResize;
+            ShowInTaskbar = false;
+            ShowActivated = false;
+            Background = Brushes.Transparent;
+            WindowStyle = WindowStyle.None;
+            AllowsTransparency = true;
+            Topmost = true;
+            if (_listBox == null)
+            {
+                _listBox = new MessageListBox();
+                _listBox.SizeChanged -= ListBox_SizeChanged;
+                _listBox.SizeChanged += ListBox_SizeChanged;
+                Content = _listBox;
+            }
+           
+        }
+        
+        internal void Push(string message, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
+        {
+            var desktopWorkingArea = SystemParameters.WorkArea;
+            var item = new MessageListBoxItem { Content = message, MessageType = type, IsCenter = center };
+            _listBox.Items.Insert(0, item);
+            if (!IsPosition || Position == Position.Bottom)
+            {
+                double x = 0;
+                double y = 0;
+                switch (Position)
+                {
+                    case Position.Top:
+                        x = (desktopWorkingArea.Right - item.Width) / 2;
+                        break;
+                    case Position.Right:
+                        x = desktopWorkingArea.Right - (item.Width + item.Margin.Right + item.Padding.Right);
+                        break;
+                    case Position.Bottom:
+                        x = (desktopWorkingArea.Right - item.Width) / 2;
+                        _listBox.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                        var controlHeight = _listBox.DesiredSize.Height;
+                        y = desktopWorkingArea.Height - controlHeight;
+                        break;
+                }
+                Height = desktopWorkingArea.Height;
+                Left = x;
+                Top = y;
+                IsPosition = true;
+            }
+        }
+        internal void Clear() 
+        {
+            if(_listBox!=null)
+                _listBox.Items.Clear();
+            Close();
+        }
+        private void ListBox_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if(_listBox.ActualHeight <= 10)
+                Close();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Themes/Message.xaml b/src/WPFDevelopers.Shared/Themes/Message.xaml
index f4e16327..78d3e421 100644
--- a/src/WPFDevelopers.Shared/Themes/Message.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Message.xaml
@@ -11,7 +11,6 @@
         x:Key="WD.MessageListBoxItem"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type controls:MessageListBoxItem}">
-        <Setter Property="FontSize" Value="{DynamicResource WD.NormalFontSize}" />
         <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="helpers:ListBoxItemExtensions.AutoRemoveOnOpacityZero" Value="True" />
@@ -73,7 +72,6 @@
                     </ControlTemplate.Resources>
                     <controls:SmallPanel
                         x:Name="PART_SmallPanel"
-                        Margin="{TemplateBinding Margin}"
                         CacheMode="BitmapCache"
                         RenderTransformOrigin=".5,0">
                         <controls:SmallPanel.RenderTransform>
@@ -153,8 +151,8 @@
                         </Trigger>
                         <Trigger Property="MessageType" Value="Information">
                             <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.InformationGeometry}" />
-                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.SuccessSolidColorBrush}" />
-                            <Setter Property="Foreground" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.SuccessNormalBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.SuccessNormalBrush}" />
                         </Trigger>
                         <Trigger Property="MessageType" Value="Question">
                             <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.QuestionGeometry}" />
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 69a92056..85b1685a 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -25,6 +25,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\IPEditBox\IPEditBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\LoadingBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\LoadingExt.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Message\MessageExt.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\WaterfallPanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Position.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCaptureExt.cs" />

From e2961ce7d625243d3e8553cea5a69cc1586855bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 17:37:13 +0800
Subject: [PATCH 37/51] Change CircleManu to CircleManu

Change CircleManu to CircleManu
---
 .../ExampleViews/CircleMenuExample.xaml       |  28 ++++
 ...mple.xaml.cs => CircleMenuExample.xaml.cs} |  16 +--
 .../ExampleViews/CircularMenuExample.xaml     |  28 ----
 .../Helpers/MenuEnum.cs                       |   2 +-
 .../Images/{CircularMenu => CircleMenu}/1.png | Bin
 .../Images/{CircularMenu => CircleMenu}/2.png | Bin
 .../Images/{CircularMenu => CircleMenu}/3.png | Bin
 .../Images/{CircularMenu => CircleMenu}/4.png | Bin
 .../Images/{CircularMenu => CircleMenu}/5.png | Bin
 .../Images/{CircularMenu => CircleMenu}/6.png | Bin
 .../Images/{CircularMenu => CircleMenu}/7.png | Bin
 .../Images/{CircularMenu => CircleMenu}/8.png | Bin
 .../ViewModels/MainVM.cs                      |   4 +-
 .../WPFDevelopers.Samples.Shared.projitems    |   6 +-
 .../WPFDevelopers.SamplesCode.csproj          |   2 +-
 .../CircleMenu.cs}                            |   8 +-
 .../CircleMenuItem.cs}                        |  17 ++-
 .../Themes/CircularMenu.xaml                  | 122 ------------------
 src/WPFDevelopers.Shared/Themes/Theme40.txt   |   2 +-
 src/WPFDevelopers.Shared/Themes/Theme45x.txt  |   2 +-
 .../WPFDevelopers.Shared.projitems            |   6 +-
 21 files changed, 60 insertions(+), 183 deletions(-)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{CircularMenuExample.xaml.cs => CircleMenuExample.xaml.cs} (72%)
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/1.png (100%)
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/2.png (100%)
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/3.png (100%)
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/4.png (100%)
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/5.png (100%)
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/6.png (100%)
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/7.png (100%)
 rename src/WPFDevelopers.Samples.Shared/Resources/Images/{CircularMenu => CircleMenu}/8.png (100%)
 rename src/WPFDevelopers.Shared/Controls/{CircularMenu/CircularMenu.cs => CircleMenu/CircleMenu.cs} (96%)
 rename src/WPFDevelopers.Shared/Controls/{CircularMenu/CircularMenuItem.cs => CircleMenu/CircleMenuItem.cs} (87%)
 delete mode 100644 src/WPFDevelopers.Shared/Themes/CircularMenu.xaml

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml
new file mode 100644
index 00000000..807291af
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml
@@ -0,0 +1,28 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.CircleMenuExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <StackPanel Background="Black">
+            <TextBlock
+                Margin="50,10,0,20"
+                FontSize="40"
+                FontWeight="Bold"
+                Foreground="#A9CC32"
+                Text="微信公众号：WPFDevelopers" />
+            <wd:CircleMenu ItemsSource="{Binding MenuArray, RelativeSource={RelativeSource AncestorType=local:CircleMenuExample}}" SelectionChanged="CircleMenu_SelectionChanged" />
+        </StackPanel>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleMenuExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleMenuExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml.cs
similarity index 72%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml.cs
index 4aaa78dd..740d358c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml.cs
@@ -11,9 +11,9 @@
 namespace WPFDevelopers.Samples.ExampleViews
 {
     /// <summary>
-    /// CircularMenuExample.xaml 的交互逻辑
+    /// CircleMenuExample.xaml 的交互逻辑
     /// </summary>
-    public partial class CircularMenuExample : UserControl
+    public partial class CircleMenuExample : UserControl
     {
         public IEnumerable MenuArray
         {
@@ -22,8 +22,8 @@ public IEnumerable MenuArray
         }
 
         public static readonly DependencyProperty MenuArrayProperty =
-            DependencyProperty.Register("MenuArray", typeof(IEnumerable), typeof(MainWindow), new PropertyMetadata(null));
-        public CircularMenuExample()
+            DependencyProperty.Register("MenuArray", typeof(IEnumerable), typeof(CircleMenuExample), new PropertyMetadata(null));
+        public CircleMenuExample()
         {
             InitializeComponent();
             
@@ -31,16 +31,16 @@ public CircularMenuExample()
             var menuItemModels = new List<MenuItemModel>();
             for (int i = 1; i <= 8; i++)
             {
-                menuItemModels.Add(new MenuItemModel { Angle = angle, Title = $"菜单{i}", IconImage = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/{i}.png")) });
+                menuItemModels.Add(new MenuItemModel { Angle = angle, Title = $"菜单{i}", IconImage = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/{i}.png")) });
                 angle += 45;
             }
             MenuArray = menuItemModels;
         }
 
-        private void CircularMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void CircleMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            var circularMenu = sender as CircularMenu;
-            MenuItemModel menuItemModel = circularMenu.SelectedItem as MenuItemModel;
+            var circularMenu = sender as CircleMenu;
+            var menuItemModel = circularMenu.SelectedItem as MenuItemModel;
             MessageBox.Show($"点击了{menuItemModel.Title}");
         }
         
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml
deleted file mode 100644
index 854f13d5..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.CircularMenuExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <controls:CodeViewer>
-        <StackPanel Background="Black">
-        <TextBlock Text="微信公众号：WPFDevelopers" FontSize="40"
-                           Foreground="#A9CC32" FontWeight="Bold"
-                           Margin="50,10,0,20"/>
-        <wd:CircularMenu ItemsSource="{Binding MenuArray,RelativeSource={RelativeSource AncestorType=local:CircularMenuExample}}" 
-                             SelectionChanged="CircularMenu_SelectionChanged"/>
-    </StackPanel>
-        <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircularMenuExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircularMenuExample.xaml.cs" 
-                CodeType="CSharp"/>
-        </controls:CodeViewer.SourceCodes>
-    </controls:CodeViewer>
-</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index a02b745d..0bcc0183 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -22,7 +22,7 @@ public enum MenuEnum
         AMap,
         TransformLayout,
         VerifyCode,
-        CircularMenu,
+        CircleMenu,
         ChatEmoji,
         ProgressBar,
         Dashboard,
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/1.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/1.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/1.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/1.png
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/2.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/2.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/2.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/2.png
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/3.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/3.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/3.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/3.png
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/4.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/4.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/4.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/4.png
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/5.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/5.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/5.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/5.png
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/6.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/6.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/6.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/6.png
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/7.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/7.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/7.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/7.png
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/8.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/8.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/CircularMenu/8.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/CircleMenu/8.png
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 01920894..1502bd45 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -160,8 +160,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.VerifyCode:
                     ControlPanel = new VerifyCodeExample();
                     break;
-                case MenuEnum.CircularMenu:
-                    ControlPanel = new CircularMenuExample();
+                case MenuEnum.CircleMenu:
+                    ControlPanel = new CircleMenuExample();
                     break;
                 case MenuEnum.BreatheLight:
                     ControlPanel = new BreatheLightExample();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 07c1fd1d..6e6d917f 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -115,9 +115,9 @@
       <SubType>Code</SubType>
       <DependentUpon>ChatEmojiExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CircularMenuExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CircleMenuExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>CircularMenuExample.xaml</DependentUpon>
+      <DependentUpon>CircleMenuExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CircularProgressBarExample.xaml.cs">
       <SubType>Code</SubType>
@@ -612,7 +612,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\CircularMenuExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\CircleMenuExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 6abeaa6e..cfa41218 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -24,8 +24,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CarouselExample.xaml.cs" Link="ExampleViews\CarouselExample.xaml.cs" DependentUpon="CarouselExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CarouselExampleEx.xaml.cs" Link="ExampleViews\CarouselExampleEx.xaml.cs" DependentUpon="CarouselExampleEx.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChatEmojiExample.xaml.cs" Link="ExampleViews\ChatEmojiExample.xaml.cs" DependentUpon="ChatEmojiExample.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularMenuExample.xaml.cs" Link="ExampleViews\CircularMenuExample.xaml.cs" DependentUpon="CircularMenuExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularProgressBarExample.xaml.cs" Link="ExampleViews\CircularProgressBarExample.xaml.cs" DependentUpon="CircularProgressBarExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircleMenuExample.xaml.cs" Link="ExampleViews\CircleMenuExample.xaml.cs" DependentUpon="CircleMenuExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CountdownTimerExample.xaml.cs" Link="ExampleViews\CountdownTimerExample.xaml.cs" DependentUpon="CountdownTimerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropAvatar\CropAvatarExample.xaml.cs" Link="ExampleViews\CropAvatar\CropAvatarExample.xaml.cs" DependentUpon="CropAvatarExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropAvatar\CropAvatarWindow.xaml.cs" Link="ExampleViews\CropAvatar\CropAvatarWindow.xaml.cs" DependentUpon="CropAvatarWindow.xaml" />
diff --git a/src/WPFDevelopers.Shared/Controls/CircularMenu/CircularMenu.cs b/src/WPFDevelopers.Shared/Controls/CircleMenu/CircleMenu.cs
similarity index 96%
rename from src/WPFDevelopers.Shared/Controls/CircularMenu/CircularMenu.cs
rename to src/WPFDevelopers.Shared/Controls/CircleMenu/CircleMenu.cs
index d5bcc845..2f196723 100644
--- a/src/WPFDevelopers.Shared/Controls/CircularMenu/CircularMenu.cs
+++ b/src/WPFDevelopers.Shared/Controls/CircleMenu/CircleMenu.cs
@@ -11,7 +11,7 @@ namespace WPFDevelopers.Controls
     [TemplatePart(Name = ItemsControlTemplateName, Type = typeof(ItemsControl))]
     [TemplatePart(Name = EllipseGeometryTemplateName, Type = typeof(EllipseGeometry))]
     [TemplatePart(Name = ToggleButtonTemplateName, Type = typeof(ToggleButton))]
-    public class CircularMenu : ListBox
+    public class CircleMenu : ListBox
     {
         private const string ItemsControlTemplateName = "PART_ItemsControl";
         private const string EllipseGeometryTemplateName = "PART_EllipseGeometry";
@@ -21,10 +21,10 @@ public class CircularMenu : ListBox
         private ItemsControl _itemsControl;
         private ToggleButton _toggleButton;
 
-        static CircularMenu()
+        static CircleMenu()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(CircularMenu),
-                new FrameworkPropertyMetadata(typeof(CircularMenu)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(CircleMenu),
+                new FrameworkPropertyMetadata(typeof(CircleMenu)));
         }
 
         public override void OnApplyTemplate()
diff --git a/src/WPFDevelopers.Shared/Controls/CircularMenu/CircularMenuItem.cs b/src/WPFDevelopers.Shared/Controls/CircleMenu/CircleMenuItem.cs
similarity index 87%
rename from src/WPFDevelopers.Shared/Controls/CircularMenu/CircularMenuItem.cs
rename to src/WPFDevelopers.Shared/Controls/CircleMenu/CircleMenuItem.cs
index 0fea9cfd..5af9623b 100644
--- a/src/WPFDevelopers.Shared/Controls/CircularMenu/CircularMenuItem.cs
+++ b/src/WPFDevelopers.Shared/Controls/CircleMenu/CircleMenuItem.cs
@@ -5,30 +5,30 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class CircularMenuItem : Control
+    public class CircleMenuItem : Control
     {
         private const string RotateTransformTemplateName = "PART_RotateTransform";
-        private static readonly Type _typeofSelf = typeof(CircularMenuItem);
+        private static readonly Type _typeofSelf = typeof(CircleMenuItem);
 
         public static readonly DependencyProperty AngleProperty =
-            DependencyProperty.Register("Angle", typeof(double), typeof(CircularMenuItem),
+            DependencyProperty.Register("Angle", typeof(double), typeof(CircleMenuItem),
                 new UIPropertyMetadata(OnAngleChanged));
 
         public static readonly DependencyProperty MenuTxtProperty =
-            DependencyProperty.Register("MenuTxt", typeof(string), typeof(CircularMenuItem),
+            DependencyProperty.Register("MenuTxt", typeof(string), typeof(CircleMenuItem),
                 new PropertyMetadata(string.Empty));
 
         public static readonly DependencyProperty BackgroundColorProperty =
-            DependencyProperty.Register("BackgroundColor", typeof(Brush), typeof(CircularMenuItem),
+            DependencyProperty.Register("BackgroundColor", typeof(Brush), typeof(CircleMenuItem),
                 new PropertyMetadata(null));
 
         public static readonly DependencyProperty IconImageProperty =
-            DependencyProperty.Register("IconImage", typeof(ImageSource), typeof(CircularMenuItem),
+            DependencyProperty.Register("IconImage", typeof(ImageSource), typeof(CircleMenuItem),
                 new PropertyMetadata(null));
 
         private RotateTransform _angleRotateTransform;
 
-        static CircularMenuItem()
+        static CircleMenuItem()
         {
             DefaultStyleKeyProperty.OverrideMetadata(_typeofSelf, new FrameworkPropertyMetadata(_typeofSelf));
         }
@@ -45,7 +45,6 @@ public string MenuTxt
             set => SetValue(MenuTxtProperty, value);
         }
 
-
         public Brush BackgroundColor
         {
             get => (Brush)GetValue(BackgroundColorProperty);
@@ -60,7 +59,7 @@ public ImageSource IconImage
 
         private static void OnAngleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var control = (CircularMenuItem)d;
+            var control = (CircleMenuItem)d;
             control.UpdateAngle();
         }
 
diff --git a/src/WPFDevelopers.Shared/Themes/CircularMenu.xaml b/src/WPFDevelopers.Shared/Themes/CircularMenu.xaml
deleted file mode 100644
index 33631a28..00000000
--- a/src/WPFDevelopers.Shared/Themes/CircularMenu.xaml
+++ /dev/null
@@ -1,122 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:convert="clr-namespace:WPFDevelopers.Converts">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <convert:IndexToColor x:Key="WD.IndexToColor" />
-    <Style
-        x:Key="WD.CircularMenuItem"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type controls:CircularMenuItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:CircularMenuItem}">
-                    <controls:SmallPanel VerticalAlignment="Top">
-                        <controls:SmallPanel.RenderTransform>
-                            <RotateTransform x:Name="PART_RotateTransform" Angle="{TemplateBinding Angle}" CenterX="200" CenterY="200" />
-                        </controls:SmallPanel.RenderTransform>
-                        <Path
-                            x:Name="PART_Path"
-                            VerticalAlignment="Center"
-                            Data="{StaticResource WD.CircularGeometry}"
-                            Fill="{TemplateBinding BackgroundColor}" />
-                        <Image
-                            Width="40"
-                            Height="40"
-                            Margin="60,100,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            RenderTransformOrigin="0.5,0.5"
-                            Source="{TemplateBinding IconImage}">
-                            <Image.RenderTransform>
-                                <RotateTransform Angle="-70" />
-                            </Image.RenderTransform>
-                        </Image>
-                    </controls:SmallPanel>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_Path" Property="Fill" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="WD.CircularMenu"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type controls:CircularMenu}">
-        <Setter Property="Width" Value="400" />
-        <Setter Property="Height" Value="400" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:CircularMenu}">
-                    <controls:SmallPanel>
-                        <ItemsControl
-                            x:Name="PART_ItemsControl"
-                            Width="{TemplateBinding Width}"
-                            Height="{TemplateBinding Height}"
-                            AlternationCount="{TemplateBinding AlternationCount}"
-                            ItemsSource="{TemplateBinding ItemsSource}">
-                            <ItemsControl.Clip>
-                                <EllipseGeometry
-                                    x:Name="PART_EllipseGeometry"
-                                    Center="200,200"
-                                    RadiusX="0"
-                                    RadiusY="0" />
-                            </ItemsControl.Clip>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <controls:CircularMenuItem
-                                        Angle="{Binding Angle}"
-                                        BackgroundColor="{Binding Path=(ItemsControl.AlternationIndex), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.IndexToColor}}"
-                                        IconImage="{Binding IconImage}"
-                                        MenuTxt="{Binding MenuTxt}" />
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <controls:SmallPanel />
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                        </ItemsControl>
-                        <ToggleButton x:Name="PART_ToggleButton" Cursor="Hand">
-                            <ToggleButton.Template>
-                                <ControlTemplate TargetType="ToggleButton">
-                                    <controls:SmallPanel>
-                                        <Ellipse
-                                            x:Name="PART_Ellipse"
-                                            Width="100"
-                                            Height="100"
-                                            Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
-                                        <controls:PathIcon
-                                            x:Name="PART_Path"
-                                            Width="20"
-                                            Height="20"
-                                            Foreground="{StaticResource WD.BackgroundSolidColorBrush}"
-                                            Kind="Add"
-                                            RenderTransformOrigin="0.5,0.5" />
-                                    </controls:SmallPanel>
-                                    <ControlTemplate.Triggers>
-                                        <Trigger Property="IsChecked" Value="True">
-                                            <Setter TargetName="PART_Path" Property="RenderTransform">
-                                                <Setter.Value>
-                                                    <RotateTransform Angle="45" />
-                                                </Setter.Value>
-                                            </Setter>
-                                        </Trigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </ToggleButton.Template>
-                        </ToggleButton>
-                    </controls:SmallPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource WD.CircularMenuItem}" TargetType="{x:Type controls:CircularMenuItem}" />
-    <Style BasedOn="{StaticResource WD.CircularMenu}" TargetType="{x:Type controls:CircularMenu}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index d7623a8b..8ead9141 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -44,8 +44,8 @@ BallLoading.xaml
 BreathLamp.xaml
 Carousel.xaml
 VerifyCode.xaml
-CircularMenu.xaml
 CircularProgressBar.xaml
+CircleMenu.xaml
 EdgeLight.xaml
 LoadingGroup.xaml
 Pagination.xaml
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 09b32b82..47e1f768 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -45,8 +45,8 @@ BallLoading.xaml
 BreathLamp.xaml
 Carousel.xaml
 VerifyCode.xaml
-CircularMenu.xaml
 CircularProgressBar.xaml
+CircleMenu.xaml
 EdgeLight.xaml
 LoadingGroup.xaml
 Pagination.xaml
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 85b1685a..90b2dfc2 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -81,9 +81,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BubblleControl\BubblleCanvas.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\EmphasizerCarousel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\MasterCarousel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircularMenu\CircularMenu.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircularMenu\CircularMenuItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CircularProgressBar\CircularProgressBar.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleMenu\CircleMenu.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleMenu\CircleMenuItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CropAvatar\CropAvatar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenuItem.cs" />
@@ -452,7 +452,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Themes\CircularMenu.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Themes\CircleMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

From d7cd8c3324e4d5b78257e8ea71440f7280de18eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 17:41:04 +0800
Subject: [PATCH 38/51] Update Resources.props

---
 src/Resources.props | 120 ++++++++------------------------------------
 1 file changed, 20 insertions(+), 100 deletions(-)

diff --git a/src/Resources.props b/src/Resources.props
index 419ade94..1205f7e4 100644
--- a/src/Resources.props
+++ b/src/Resources.props
@@ -22,45 +22,16 @@
 			<HintPath>..\..\Reference\System.Windows.Interactivity.dll</HintPath>
 		</Reference>
 	</ItemGroup>
+	
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico">
 			<Link>WPFDevelopers.ico</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\发烧.png">
-			<Link>Resources\emoji\发烧.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\大笑.png">
-			<Link>Resources\emoji\大笑.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\得意.png">
-			<Link>Resources\emoji\得意.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\思考.png">
-			<Link>Resources\emoji\思考.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\生病.png">
-			<Link>Resources\emoji\生病.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\破涕为笑.png">
-			<Link>Resources\emoji\破涕为笑.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Lock.png">
-			<Link>Resources\Assets\Lock.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Mail.png">
-			<Link>Resources\Assets\Mail.png</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\*.png">
+			<Link>Resources\emoji\%(Filename)%(Extension)</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\User.png">
-			<Link>Resources\Assets\User.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Clear.png">
-			<Link>Resources\Assets\Clear.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Background.png">
-			<Link>Resources\Assets\Background.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Logo.png">
-			<Link>Resources\Assets\Logo.png</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\*.png">
+			<Link>Resources\Assets\%(Filename)%(Extension)</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Fonts\fixedsys.ttf">
 			<Link>Resources\Fonts\fixedsys.ttf</Link>
@@ -71,77 +42,26 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AnimationNavigationBar3D\background.png">
 			<Link>Resources\Images\AnimationNavigationBar3D\background.png</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\0.jpg">
-			<Link>Resources\Images\Breathe\0.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\1.jpg">
-			<Link>Resources\Images\Breathe\1.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\2.jpg">
-			<Link>Resources\Images\Breathe\2.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Left.jpg">
-			<Link>Resources\Images\Chat\Left.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Right.jpg">
-			<Link>Resources\Images\Chat\Right.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\jingtao.png">
-			<Link>Resources\Images\Chat\UserImages\jingtao.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\yanjinhua.png">
-			<Link>Resources\Images\Chat\UserImages\yanjinhua.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\1.png">
-			<Link>Resources\Images\CircularMenu\1.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\2.png">
-			<Link>Resources\Images\CircularMenu\2.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\3.png">
-			<Link>Resources\Images\CircularMenu\3.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\4.png">
-			<Link>Resources\Images\CircularMenu\4.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\5.png">
-			<Link>Resources\Images\CircularMenu\5.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\6.png">
-			<Link>Resources\Images\CircularMenu\6.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\7.png">
-			<Link>Resources\Images\CircularMenu\7.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\8.png">
-			<Link>Resources\Images\CircularMenu\8.png</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\0.jpg">
-			<Link>Resources\Images\Craouse\0.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\1.jpg">
-			<Link>Resources\Images\Craouse\1.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\2.jpg">
-			<Link>Resources\Images\Craouse\2.jpg</Link>
-		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\3.jpg">
-			<Link>Resources\Images\Craouse\3.jpg</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\*.jpg">
+			<Link>Resources\Images\Breathe\%(Filename)%(Extension)</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\4.jpg">
-			<Link>Resources\Images\Craouse\4.jpg</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\*.jpg">
+			<Link>Resources\Images\Chat\%(Filename)%(Extension)</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
-			<Link>Resources\Images\Crop\0.jpg</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\*.png">
+			<Link>Resources\Images\Chat\UserImages\%(Filename)%(Extension)</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Eye_50px.png">
-			<Link>Resources\Images\Passwrod\Eye_50px.png</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircleMenu\*.png">
+			<Link>Resources\Images\CircleMenu\%(Filename)%(Extension)</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Invisible_50px.png">
-			<Link>Resources\Images\Passwrod\Invisible_50px.png</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\*.jpg">
+			<Link>Resources\Images\Craouse\%(Filename)%(Extension)</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Lock_48px.png">
-			<Link>Resources\Images\Passwrod\Lock_48px.png</Link>
+			<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
+				<Link>Resources\Images\Crop\0.jpg</Link>
+			</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\*.png">
+			<Link>Resources\Images\Passwrod\%(Filename)%(Extension)</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Snow\SnowTree.png">
 			<Link>Resources\Images\Snow\SnowTree.png</Link>

From 2bfd1acbbeec868829ef1c2c0cd24859c1886573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 17:41:08 +0800
Subject: [PATCH 39/51] Update TargetFrameworks.props

---
 src/TargetFrameworks.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/TargetFrameworks.props b/src/TargetFrameworks.props
index 20a68cdc..797279f4 100644
--- a/src/TargetFrameworks.props
+++ b/src/TargetFrameworks.props
@@ -2,6 +2,11 @@
 	<PropertyGroup>
 		<TargetFrameworks>net45;net46;net47;net48;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;netcoreapp3.0</TargetFrameworks>
 	</PropertyGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
+		<PackageReference Include="System.Drawing.Common">
+			<Version>7.0.0</Version>
+		</PackageReference>
+	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
 		<PackageReference Include="System.Drawing.Common">
 			<Version>7.0.0</Version>

From 263f86c315d55e1d11b5b223cab4e0a5deeb8ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 17:41:13 +0800
Subject: [PATCH 40/51] Update WPFDevelopers.Net45x.csproj

---
 src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
index 23f90c9f..9486cadf 100644
--- a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
+++ b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
@@ -18,10 +18,4 @@
 	  <Resource Include="Effects\GrayscaleEffect.ps" />
 	  <Resource Include="Resources\Audio\shake.wav" />
 	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
-	  <PackageReference Include="System.Drawing.Common">
-	    <Version>7.0.0</Version>
-	  </PackageReference>
-	</ItemGroup>
-	
 </Project>
\ No newline at end of file

From be272b94d3489ffaa89fd6b83489d4d1d3bf3348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 20:09:17 +0800
Subject: [PATCH 41/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#128=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#128 ）
---
 .../CircleProgressBarExample.xaml             |  61 ++++++++
 .../CircleProgressBarExample.xaml.cs          |  15 ++
 .../CircularProgressBarExample.xaml           |  47 -------
 .../CircularProgressBarExample.xaml.cs        |  27 ----
 .../Helpers/MenuEnum.cs                       |   2 +-
 .../ViewModels/MainVM.cs                      |   4 +-
 .../WPFDevelopers.Samples.Shared.projitems    |   6 +-
 .../WPFDevelopers.SamplesCode.csproj          |   4 +-
 .../CircleProgressBar.cs}                     |  54 +++----
 .../Themes/Basic/Colors.xaml                  |   6 +
 .../Themes/CircleProgressBar.xaml             | 132 ++++++++++++++++++
 .../Themes/CircularProgressBar.xaml           |  78 -----------
 .../WPFDevelopers.Shared.projitems            |   4 +-
 13 files changed, 246 insertions(+), 194 deletions(-)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml.cs
 rename src/WPFDevelopers.Shared/Controls/{CircularProgressBar/CircularProgressBar.cs => CircleProgressBar/CircleProgressBar.cs} (70%)
 create mode 100644 src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
 delete mode 100644 src/WPFDevelopers.Shared/Themes/CircularProgressBar.xaml

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml
new file mode 100644
index 00000000..c7a319e3
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml
@@ -0,0 +1,61 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.CircleProgressBarExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <UniformGrid>
+            <wd:CircleProgressBar
+                Width="80"
+                Height="80"
+                Background="#21BA9D"
+                BorderBrush="LightGray"
+                BrushStrokeThickness="2"
+                StrokeThickness="5"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+
+            <wd:CircleProgressBar
+                Background="#E14D5F"
+                BorderBrush="#42ABAC"
+                BrushStrokeThickness="4"
+                IsRound="True"
+                StrokeThickness="7"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <wd:CircleProgressBar
+                Width="50"
+                Height="50"
+                Background="#1FA7FC"
+                BorderBrush="#D6D6D6"
+                BrushStrokeThickness="10"
+                Foreground="Black"
+                IsRound="True"
+                StrokeThickness="10"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <wd:CircleProgressBar
+                Width="100"
+                Height="100"
+                BrushStrokeThickness="10"
+                IsRound="True"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <wd:CircleProgressBar Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <Slider
+                x:Name="CircleSlider"
+                VerticalAlignment="Center"
+                IsSnapToTickEnabled="True"
+                Maximum="100"
+                Minimum="0"
+                Value="10" />
+        </UniformGrid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleProgressBarExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleProgressBarExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml.cs
new file mode 100644
index 00000000..c6b6ca8b
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// CircleProgressBarExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class CircleProgressBarExample : UserControl
+    {
+        public CircleProgressBarExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
deleted file mode 100644
index 7b8f195d..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.CircularProgressBarExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <controls:CodeViewer>
-        <UniformGrid>
-            <wd:CircularProgressBar Background="#21BA9D"
-                                       Value="{Binding ElementName=CirularSlider,Path=Value}"
-                                       BrushStrokeThickness="2"
-                                       StrokeThickness="3"
-                                       Size="20,30"
-                                       BorderBrush="LightGray"/>
-
-            <wd:CircularProgressBar Background="#E14D5F" 
-                                        Value="{Binding ElementName=CirularSlider,Path=Value}"
-                                       BrushStrokeThickness="4"
-                                       StrokeThickness="5"
-                                       Size="15,15"
-                                        BorderBrush="#42ABAC" />
-            <wd:CircularProgressBar Background="#1FA7FC" 
-                                       BorderBrush="#D6D6D6" 
-                                       Value="{Binding ElementName=CirularSlider,Path=Value}"
-                                       BrushStrokeThickness="10"
-                                       StrokeThickness="10"
-                                       Foreground="Black"/>
-            <wd:CircularProgressBar Value="{Binding ElementName=CirularSlider,Path=Value}"/>
-
-            <Slider Minimum="0" Maximum="100" 
-                    x:Name="CirularSlider" IsSnapToTickEnabled="True"
-                    VerticalAlignment="Center" Value="10"/>
-        </UniformGrid>
-        <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircularProgressBarExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircularProgressBarExample.xaml.cs" 
-                CodeType="CSharp"/>
-        </controls:CodeViewer.SourceCodes>
-    </controls:CodeViewer>
-</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml.cs
deleted file mode 100644
index d329787b..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// CircularProgressBarExample.xaml 的交互逻辑
-    /// </summary>
-    public partial class CircularProgressBarExample : UserControl
-    {
-        public CircularProgressBarExample()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index 0bcc0183..68a18aba 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -24,7 +24,7 @@ public enum MenuEnum
         VerifyCode,
         CircleMenu,
         ChatEmoji,
-        ProgressBar,
+        CircleProgressBar,
         Dashboard,
         PieControl,
         Password,
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 1502bd45..d003502e 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -170,8 +170,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.ChatEmoji:
                     ControlPanel = new ChatEmojiExample();
                     break;
-                case MenuEnum.ProgressBar:
-                    ControlPanel = new CircularProgressBarExample();
+                case MenuEnum.CircleProgressBar:
+                    ControlPanel = new CircleProgressBarExample();
                     break;
                 case MenuEnum.Dashboard:
                     ControlPanel = new DashboardExample();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 6e6d917f..7771ddc7 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -119,9 +119,9 @@
       <SubType>Code</SubType>
       <DependentUpon>CircleMenuExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CircularProgressBarExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CircleProgressBarExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>CircularProgressBarExample.xaml</DependentUpon>
+      <DependentUpon>CircleProgressBarExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ColorPickerExample.xaml.cs">
       <DependentUpon>ColorPickerExample.xaml</DependentUpon>
@@ -616,7 +616,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\CircularProgressBarExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\CircleProgressBarExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index cfa41218..308f7d07 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -194,8 +194,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularMenuExample.xaml">
 			<Link>ExampleViews\CircularMenuExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularProgressBarExample.xaml">
-			<Link>ExampleViews\CircularProgressBarExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircleProgressBarExample.xaml">
+			<Link>ExampleViews\CircleProgressBarExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CountdownTimerExample.xaml">
 			<Link>ExampleViews\CountdownTimerExample.xaml</Link>
diff --git a/src/WPFDevelopers.Shared/Controls/CircularProgressBar/CircularProgressBar.cs b/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
similarity index 70%
rename from src/WPFDevelopers.Shared/Controls/CircularProgressBar/CircularProgressBar.cs
rename to src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
index c13c49cb..c3391d4d 100644
--- a/src/WPFDevelopers.Shared/Controls/CircularProgressBar/CircularProgressBar.cs
+++ b/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
@@ -11,73 +11,63 @@ namespace WPFDevelopers.Controls
     [TemplatePart(Name = PathFigureTemplateName, Type = typeof(PathFigure))]
     [TemplatePart(Name = PathFigureAngleTemplateName, Type = typeof(PathFigure))]
     [TemplatePart(Name = TextBlockTemplateName, Type = typeof(TextBlock))]
-    public class CircularProgressBar : ProgressBar
+    public class CircleProgressBar : ProgressBar
     {
         private const string ArcSegmentTemplateName = "PART_ArcSegment";
         private const string ArcSegmentAngleTemplateName = "PART_ArcSegmentAngle";
         private const string PathFigureTemplateName = "PART_PathFigure";
         private const string PathFigureAngleTemplateName = "PART_PathFigureAngle";
         private const string TextBlockTemplateName = "PART_TextBlock";
+        private readonly Size _size = new Size(50,50);
         private ArcSegment _arcSegment, _arcSegmentAngle;
         private PathFigure _pathFigure, _pathFigureAngle;
         private TextBlock _textBlock;
 
+        public static readonly DependencyProperty IsRoundProperty =
+            DependencyProperty.Register("IsRound", typeof(bool), typeof(CircleProgressBar),
+                new PropertyMetadata(false));
 
-        public static readonly DependencyProperty SizeProperty =
-           DependencyProperty.Register("Size", typeof(Size), typeof(CircularProgressBar),
-               new PropertyMetadata(new Size(50,50)));
         public static readonly DependencyProperty AngleProperty =
-            DependencyProperty.Register("Angle", typeof(double), typeof(CircularProgressBar),
+            DependencyProperty.Register("Angle", typeof(double), typeof(CircleProgressBar),
                 new PropertyMetadata(0.0));
 
         public static readonly DependencyProperty StrokeThicknessProperty =
-            DependencyProperty.Register("StrokeThickness", typeof(double), typeof(CircularProgressBar),
-                new PropertyMetadata(10.0));
+            DependencyProperty.Register("StrokeThickness", typeof(double), typeof(CircleProgressBar),
+                new PropertyMetadata(5.0));
 
         public static readonly DependencyProperty BrushStrokeThicknessProperty =
-            DependencyProperty.Register("BrushStrokeThickness", typeof(double), typeof(CircularProgressBar),
-                new PropertyMetadata(1.0));
+            DependencyProperty.Register("BrushStrokeThickness", typeof(double), typeof(CircleProgressBar),
+                new PropertyMetadata(5.0));
 
-        public CircularProgressBar()
+        public CircleProgressBar()
         {
             ValueChanged += CircularProgressBar_ValueChanged;
         }
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-           
-            if (Size.Width != Size.Height)
-            {
-                var max = Math.Max(Size.Width, Size.Height);
-                Size = new Size(max, max);
-            }
-           
             _pathFigure = GetTemplateChild(PathFigureTemplateName) as PathFigure;
             _pathFigureAngle = GetTemplateChild(PathFigureAngleTemplateName) as PathFigure;
-            _pathFigure.StartPoint = new Point(Size.Width, 0);
-            _pathFigureAngle.StartPoint = new Point(Size.Width, 0);
+            _pathFigure.StartPoint = new Point(_size.Width, 0);
+            _pathFigureAngle.StartPoint = new Point(_size.Width, 0);
             _arcSegment = GetTemplateChild(ArcSegmentTemplateName) as ArcSegment;
-            _arcSegment.Size = Size;
-            _arcSegment.Point = new Point(Size.Width - 0.000872664626, 7.61543361704753E-09);
+            _arcSegment.Size = _size;
+            _arcSegment.Point = new Point(_size.Width - 0.000872664626, 7.61543361704753E-09);
             _arcSegmentAngle = GetTemplateChild(ArcSegmentAngleTemplateName) as ArcSegment;
-            _arcSegmentAngle.Size = Size;
+            _arcSegmentAngle.Size = _size;
             _textBlock = GetTemplateChild(TextBlockTemplateName) as TextBlock;
-            if (Size.Width < 15)
-            {
-                FontSize = 8;
-            }
         }
-        
-        public Size Size
+
+        public bool IsRound
         {
-            get => (Size)GetValue(SizeProperty);
-            set => SetValue(SizeProperty, value);
+            get => (bool)GetValue(IsRoundProperty);
+            set => SetValue(IsRoundProperty, value);
         }
 
         public double Angle
         {
             get => (double)GetValue(AngleProperty);
-            set => SetValue(AngleProperty, value);
+            private set => SetValue(AngleProperty, value);
         }
 
         public double StrokeThickness
@@ -94,7 +84,7 @@ public double BrushStrokeThickness
 
         private void CircularProgressBar_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            var bar = sender as CircularProgressBar;
+            var bar = sender as CircleProgressBar;
             var currentAngle = bar.Angle;
             var targetAngle = e.NewValue / bar.Maximum * 359.999;
             var anim = new DoubleAnimation(currentAngle, targetAngle, TimeSpan.FromMilliseconds(500));
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
index e1f44c5d..024691cb 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
@@ -28,6 +28,12 @@
         x:Key="WD.NormalSolidColorBrush"
         po:Freeze="True"
         Color="{StaticResource WD.NormalColor}" />
+    <Color x:Key="WD.NormalSuccess" po:Freeze="True">#FF13CE67</Color>
+    <SolidColorBrush
+        x:Key="WD.SuccessNormalBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.NormalSuccess}" />
+
     <!--  Success颜色  -->
 
     <Color x:Key="WD.SuccessBorderBrushColor" po:Freeze="True">#99FA68</Color>
diff --git a/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml b/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
new file mode 100644
index 00000000..4b4037bb
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
@@ -0,0 +1,132 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:convert="clr-namespace:WPFDevelopers.Converts"
+    xmlns:shapes="clr-namespace:Microsoft.Expression.Drawing.Shapes">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <convert:AngleToPointConverter x:Key="WD.PrConverter" />
+    <convert:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
+    <Style
+        x:Key="WD.CircleProgressBar"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:CircleProgressBar}">
+        <Setter Property="Maximum" Value="100" />
+        <Setter Property="StrokeThickness" Value="5" />
+        <Setter Property="BrushStrokeThickness" Value="5" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircleProgressBar}">
+                    <controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                        <Viewbox Margin="{TemplateBinding Padding}">
+                            <Canvas Width="{Binding ElementName=PART_Path, Path=ActualWidth}" Height="{Binding ElementName=PART_Path, Path=ActualHeight}">
+                                <Path
+                                    x:Name="PART_Path"
+                                    Stroke="{TemplateBinding BorderBrush}"
+                                    StrokeThickness="{TemplateBinding BrushStrokeThickness}">
+                                    <Path.Data>
+                                        <PathGeometry>
+                                            <PathFigure x:Name="PART_PathFigure">
+                                                <ArcSegment
+                                                    x:Name="PART_ArcSegment"
+                                                    IsLargeArc="True"
+                                                    SweepDirection="Clockwise" />
+                                            </PathFigure>
+                                        </PathGeometry>
+                                    </Path.Data>
+                                </Path>
+                                <Path
+                                    x:Name="PART_PathArc"
+                                    Stroke="{TemplateBinding Background}"
+                                    StrokeThickness="{TemplateBinding StrokeThickness}">
+                                    <Path.Data>
+                                        <PathGeometry>
+                                            <PathFigure x:Name="PART_PathFigureAngle">
+                                                <ArcSegment
+                                                    x:Name="PART_ArcSegmentAngle"
+                                                    IsLargeArc="{Binding Path=Angle, Converter={StaticResource WD.IsLargeConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType=ProgressBar}}"
+                                                    SweepDirection="Clockwise">
+                                                    <ArcSegment.Point>
+                                                        <MultiBinding Converter="{StaticResource WD.PrConverter}">
+                                                            <Binding Path="Angle" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
+                                                            <Binding Path="Size" RelativeSource="{RelativeSource Mode=Self}" />
+                                                        </MultiBinding>
+                                                    </ArcSegment.Point>
+                                                </ArcSegment>
+                                            </PathFigure>
+                                        </PathGeometry>
+                                    </Path.Data>
+                                </Path>
+                            </Canvas>
+                        </Viewbox>
+                        <TextBlock
+                            x:Name="PART_TextBlock"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="{TemplateBinding FontSize}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsRound" Value="True">
+                            <Setter TargetName="PART_PathArc" Property="StrokeStartLineCap" Value="Round" />
+                            <Setter TargetName="PART_PathArc" Property="StrokeEndLineCap" Value="Round" />
+                        </Trigger>
+                        <Trigger Property="Value" Value="100">
+                            <Setter Property="Background" Value="{StaticResource WD.SuccessNormalBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!--<Style
+        x:Key="WD.CircularProgressBar"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:CircularProgressBar}">
+        <Setter Property="Maximum" Value="100" />
+        <Setter Property="StrokeThickness" Value="10" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.InfoSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircularProgressBar}">
+                    <controls:SmallPanel>
+                        <shapes:Arc
+                            x:Name="PART_ArcBackground"
+                            Width="{TemplateBinding ActualWidth}"
+                            Height="{TemplateBinding ActualHeight}"
+                            ArcThickness="{TemplateBinding BrushStrokeThickness}"
+                            Fill="{TemplateBinding BorderBrush}"
+                            Stretch="None" />
+                        <shapes:Arc
+                            x:Name="PART_Arc"
+                            Width="{TemplateBinding ActualWidth}"
+                            Height="{TemplateBinding ActualHeight}"
+                            ArcThickness="{TemplateBinding StrokeThickness}"
+                            EndAngle=""
+                            Fill="{TemplateBinding Background}"
+                            Stretch="None" />
+                        <TextBlock
+                            x:Name="PART_TextBlock"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="{TemplateBinding FontSize}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>-->
+    <Style BasedOn="{StaticResource WD.CircleProgressBar}" TargetType="{x:Type controls:CircleProgressBar}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/CircularProgressBar.xaml b/src/WPFDevelopers.Shared/Themes/CircularProgressBar.xaml
deleted file mode 100644
index d98ce31d..00000000
--- a/src/WPFDevelopers.Shared/Themes/CircularProgressBar.xaml
+++ /dev/null
@@ -1,78 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:convert="clr-namespace:WPFDevelopers.Converts">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <convert:AngleToPointConverter x:Key="WD.PrConverter" />
-    <convert:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
-    <Style
-        x:Key="WD.CircularProgressBar"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type controls:CircularProgressBar}">
-        <Setter Property="Maximum" Value="100" />
-        <Setter Property="StrokeThickness" Value="10" />
-        <Setter Property="Foreground" Value="{DynamicResource WD.InfoSolidColorBrush}" />
-        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:CircularProgressBar}">
-                    <controls:SmallPanel
-                        Width="{Binding ElementName=PART_Path, Path=ActualWidth}"
-                        Height="{Binding ElementName=PART_Path, Path=ActualHeight}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Canvas>
-                            <Path
-                                x:Name="PART_Path"
-                                Stroke="{TemplateBinding BorderBrush}"
-                                StrokeThickness="{TemplateBinding BrushStrokeThickness}">
-                                <Path.Data>
-                                    <PathGeometry>
-                                        <PathFigure x:Name="PART_PathFigure">
-                                            <ArcSegment
-                                                x:Name="PART_ArcSegment"
-                                                IsLargeArc="True"
-                                                SweepDirection="Clockwise" />
-                                        </PathFigure>
-                                    </PathGeometry>
-                                </Path.Data>
-                            </Path>
-                            <Path Stroke="{TemplateBinding Background}" StrokeThickness="{TemplateBinding StrokeThickness}">
-                                <Path.Data>
-                                    <PathGeometry>
-                                        <PathFigure x:Name="PART_PathFigureAngle">
-                                            <ArcSegment
-                                                x:Name="PART_ArcSegmentAngle"
-                                                IsLargeArc="{Binding Path=Angle, Converter={StaticResource WD.IsLargeConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType=ProgressBar}}"
-                                                SweepDirection="Clockwise">
-                                                <ArcSegment.Point>
-                                                    <MultiBinding Converter="{StaticResource WD.PrConverter}">
-                                                        <Binding Path="Angle" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
-                                                        <Binding Path="Size" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
-                                                    </MultiBinding>
-                                                </ArcSegment.Point>
-                                            </ArcSegment>
-                                        </PathFigure>
-                                    </PathGeometry>
-                                </Path.Data>
-                            </Path>
-                        </Canvas>
-                        <TextBlock
-                            x:Name="PART_TextBlock"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
-                    </controls:SmallPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource WD.CircularProgressBar}" TargetType="{x:Type controls:CircularProgressBar}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 90b2dfc2..1c776717 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -81,9 +81,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BubblleControl\BubblleCanvas.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\EmphasizerCarousel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\MasterCarousel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircularProgressBar\CircularProgressBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleMenu\CircleMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleMenu\CircleMenuItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleProgressBar\CircleProgressBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CropAvatar\CropAvatar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenuItem.cs" />
@@ -456,7 +456,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Themes\CircularProgressBar.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Themes\CircleProgressBar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

From 01e959c44ad8ca1750227742aad0019b090d56b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 20:09:44 +0800
Subject: [PATCH 42/51] Update Drawer.cs

---
 src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs b/src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs
index 24784596..49f68218 100644
--- a/src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs
+++ b/src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs
@@ -14,7 +14,7 @@ public class Drawer : HeaderedContentControl
         private const string BorderHeaderTemplateName = "PART_Header";
         private const string BorderMarkTemplateName = "PART_Mark";
 
-        public static readonly DependencyProperty EdgePositionProperty =
+        public static readonly DependencyProperty PositionProperty =
             DependencyProperty.Register("Position", typeof(Position), typeof(Drawer),
                 new PropertyMetadata(Position.Left));
 
@@ -37,8 +37,8 @@ static Drawer()
 
         public Position Position
         {
-            get => (Position) GetValue(EdgePositionProperty);
-            set => SetValue(EdgePositionProperty, value);
+            get => (Position) GetValue(PositionProperty);
+            set => SetValue(PositionProperty, value);
         }
 
         public bool IsOpen

From 68e6068604495013bb98c05ea57f984ff294b278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 20:11:23 +0800
Subject: [PATCH 43/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#128=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#128）
---
 src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 308f7d07..cf8f3b55 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -24,8 +24,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CarouselExample.xaml.cs" Link="ExampleViews\CarouselExample.xaml.cs" DependentUpon="CarouselExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CarouselExampleEx.xaml.cs" Link="ExampleViews\CarouselExampleEx.xaml.cs" DependentUpon="CarouselExampleEx.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChatEmojiExample.xaml.cs" Link="ExampleViews\ChatEmojiExample.xaml.cs" DependentUpon="ChatEmojiExample.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularProgressBarExample.xaml.cs" Link="ExampleViews\CircularProgressBarExample.xaml.cs" DependentUpon="CircularProgressBarExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircleMenuExample.xaml.cs" Link="ExampleViews\CircleMenuExample.xaml.cs" DependentUpon="CircleMenuExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircleProgressBarExample.xaml.cs" Link="ExampleViews\CircleProgressBarExample.xaml.cs" DependentUpon="CircleProgressBarExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CountdownTimerExample.xaml.cs" Link="ExampleViews\CountdownTimerExample.xaml.cs" DependentUpon="CountdownTimerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropAvatar\CropAvatarExample.xaml.cs" Link="ExampleViews\CropAvatar\CropAvatarExample.xaml.cs" DependentUpon="CropAvatarExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropAvatar\CropAvatarWindow.xaml.cs" Link="ExampleViews\CropAvatar\CropAvatarWindow.xaml.cs" DependentUpon="CropAvatarWindow.xaml" />

From c2a0c245555de01149d1b9ed7fb7e2fc733bda22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 20:13:20 +0800
Subject: [PATCH 44/51] Change CircleManu to CircleManu

Change CircleManu to CircleManu
---
 .../DrawerMenu/DrawerMenuExample.xaml         |  10 +-
 .../DrawerMenu/DrawerMenuExample.xaml.cs      |   6 +-
 .../WPFDevelopers.SamplesCode.csproj          |   4 +-
 .../Themes/CircleMenu.xaml                    | 122 ++++++++++++++++++
 4 files changed, 132 insertions(+), 10 deletions(-)
 create mode 100644 src/WPFDevelopers.Shared/Themes/CircleMenu.xaml

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
index c3e026d7..f0c038dc 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
@@ -25,27 +25,27 @@
                     <wd:DrawerMenu SelectionChanged="DrawerMenu_SelectionChanged">
                         <wd:DrawerMenuItem Text="主页">
                             <wd:DrawerMenuItem.Icon>
-                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/2.png" />
+                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/2.png" />
                             </wd:DrawerMenuItem.Icon>
                         </wd:DrawerMenuItem>
                         <wd:DrawerMenuItem Text="Edge">
                             <wd:DrawerMenuItem.Icon>
-                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/4.png" />
+                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/4.png" />
                             </wd:DrawerMenuItem.Icon>
                         </wd:DrawerMenuItem>
                         <wd:DrawerMenuItem Text="云盘">
                             <wd:DrawerMenuItem.Icon>
-                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/1.png" />
+                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/1.png" />
                             </wd:DrawerMenuItem.Icon>
                         </wd:DrawerMenuItem>
                         <wd:DrawerMenuItem Text="邮件">
                             <wd:DrawerMenuItem.Icon>
-                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/8.png" />
+                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/8.png" />
                             </wd:DrawerMenuItem.Icon>
                         </wd:DrawerMenuItem>
                         <wd:DrawerMenuItem Text="视频">
                             <wd:DrawerMenuItem.Icon>
-                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/6.png" />
+                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/6.png" />
                             </wd:DrawerMenuItem.Icon>
                         </wd:DrawerMenuItem>
                         <wd:DrawerMenuItem Text="Bus">
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs
index 2b81fad0..43212ae8 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs
@@ -33,9 +33,9 @@ public DrawerMenuExample()
         {
             InitializeComponent();
             var items = new List<DrawerMenuItem>();
-            items.Add(new DrawerMenuItem { Text = "Menu01", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/1.png")) } });
-            items.Add(new DrawerMenuItem { Text = "Menu02", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/2.png")) } });
-            items.Add(new DrawerMenuItem { Text = "Menu03", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/3.png")) } });
+            items.Add(new DrawerMenuItem { Text = "Menu01", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/1.png")) } });
+            items.Add(new DrawerMenuItem { Text = "Menu02", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/2.png")) } });
+            items.Add(new DrawerMenuItem { Text = "Menu03", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/3.png")) } });
             DrawerMenuItems = items;
         }
 
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index cf8f3b55..5fbb02b5 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -191,8 +191,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChatEmojiExample.xaml">
 			<Link>ExampleViews\ChatEmojiExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularMenuExample.xaml">
-			<Link>ExampleViews\CircularMenuExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircleMenuExample.xaml">
+			<Link>ExampleViews\CircleMenuExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircleProgressBarExample.xaml">
 			<Link>ExampleViews\CircleProgressBarExample.xaml</Link>
diff --git a/src/WPFDevelopers.Shared/Themes/CircleMenu.xaml b/src/WPFDevelopers.Shared/Themes/CircleMenu.xaml
new file mode 100644
index 00000000..a85d8065
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/CircleMenu.xaml
@@ -0,0 +1,122 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:convert="clr-namespace:WPFDevelopers.Converts">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <convert:IndexToColor x:Key="WD.IndexToColor" />
+    <Style
+        x:Key="WD.CircleMenuItem"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:CircleMenuItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircleMenuItem}">
+                    <controls:SmallPanel VerticalAlignment="Top">
+                        <controls:SmallPanel.RenderTransform>
+                            <RotateTransform x:Name="PART_RotateTransform" Angle="{TemplateBinding Angle}" CenterX="200" CenterY="200" />
+                        </controls:SmallPanel.RenderTransform>
+                        <Path
+                            x:Name="PART_Path"
+                            VerticalAlignment="Center"
+                            Data="{StaticResource WD.CircularGeometry}"
+                            Fill="{TemplateBinding BackgroundColor}" />
+                        <Image
+                            Width="40"
+                            Height="40"
+                            Margin="60,100,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            RenderTransformOrigin="0.5,0.5"
+                            Source="{TemplateBinding IconImage}">
+                            <Image.RenderTransform>
+                                <RotateTransform Angle="-70" />
+                            </Image.RenderTransform>
+                        </Image>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="WD.CircleMenu"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:CircleMenu}">
+        <Setter Property="Width" Value="400" />
+        <Setter Property="Height" Value="400" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircleMenu}">
+                    <controls:SmallPanel>
+                        <ItemsControl
+                            x:Name="PART_ItemsControl"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            AlternationCount="{TemplateBinding AlternationCount}"
+                            ItemsSource="{TemplateBinding ItemsSource}">
+                            <ItemsControl.Clip>
+                                <EllipseGeometry
+                                    x:Name="PART_EllipseGeometry"
+                                    Center="200,200"
+                                    RadiusX="0"
+                                    RadiusY="0" />
+                            </ItemsControl.Clip>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <controls:CircleMenuItem
+                                        Angle="{Binding Angle}"
+                                        BackgroundColor="{Binding Path=(ItemsControl.AlternationIndex), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.IndexToColor}}"
+                                        IconImage="{Binding IconImage}"
+                                        MenuTxt="{Binding MenuTxt}" />
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <controls:SmallPanel />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                        <ToggleButton x:Name="PART_ToggleButton" Cursor="Hand">
+                            <ToggleButton.Template>
+                                <ControlTemplate TargetType="ToggleButton">
+                                    <controls:SmallPanel>
+                                        <Ellipse
+                                            x:Name="PART_Ellipse"
+                                            Width="100"
+                                            Height="100"
+                                            Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
+                                        <controls:PathIcon
+                                            x:Name="PART_Path"
+                                            Width="20"
+                                            Height="20"
+                                            Foreground="{StaticResource WD.BackgroundSolidColorBrush}"
+                                            Kind="Add"
+                                            RenderTransformOrigin="0.5,0.5" />
+                                    </controls:SmallPanel>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsChecked" Value="True">
+                                            <Setter TargetName="PART_Path" Property="RenderTransform">
+                                                <Setter.Value>
+                                                    <RotateTransform Angle="45" />
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </ToggleButton.Template>
+                        </ToggleButton>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.CircleMenuItem}" TargetType="{x:Type controls:CircleMenuItem}" />
+    <Style BasedOn="{StaticResource WD.CircleMenu}" TargetType="{x:Type controls:CircleMenu}" />
+</ResourceDictionary>
\ No newline at end of file

From 66df448e0093998da2a385458a43f59a4435cf97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 20:13:29 +0800
Subject: [PATCH 45/51] Update IPEditBox.xaml

---
 src/WPFDevelopers.Shared/Themes/IPEditBox.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml b/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
index d721465e..15cb15b9 100644
--- a/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
@@ -35,7 +35,6 @@
                     </ControlTemplate.Resources>
                     <Border
                         x:Name="PART_Border"
-                        
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"

From 754a0eb5083b12a7eaf11fa432c036c419f46f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 20:14:17 +0800
Subject: [PATCH 46/51] Update TimePicker.cs

Unable to modify the problem after having value
---
 .../Controls/TimePicker/TimePicker.cs                     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
index d3f4413c..b927dbd6 100644
--- a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
@@ -129,7 +129,13 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
                 _timeSelector.SelectedTimeChanged -= TimeSelector_SelectedTimeChanged;
                 if (DateTime.TryParse(_textBox.Text, out var dateTime))
                 {
-                    if (SelectedTime.HasValue && dateTime.ToString(SelectedTimeFormat) == SelectedTime.Value.ToString(SelectedTimeFormat)) return;
+                    if (SelectedTime.HasValue
+                        && 
+                        dateTime.ToString(SelectedTimeFormat) == SelectedTime.Value.ToString(SelectedTimeFormat))
+                    {
+                        _timeSelector.SelectedTimeChanged += TimeSelector_SelectedTimeChanged;
+                        return;
+                    } 
                     SelectedTime = dateTime;
                 }
                 else

From 054386bdd2431a1fff371ef9efb6f970ffdb5c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Dec 2024 20:15:34 +0800
Subject: [PATCH 47/51] Update WDMessageBox.cs

Change the icon color after modifying the information
---
 src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
index fe03db52..9409a759 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
@@ -256,7 +256,7 @@ private void DisplayImage(MessageBoxImage image)
                 case MessageBoxImage.Information:
                     _geometry = (Geometry) Application.Current.TryFindResource("WD.WarningGeometry");
                     _solidColorBrush =
-                        (SolidColorBrush) Application.Current.TryFindResource("WD.SuccessSolidColorBrush");
+                        (SolidColorBrush) Application.Current.TryFindResource("WD.SuccessNormalBrush");
                     break;
                 case MessageBoxImage.Question:
                     _geometry = (Geometry) Application.Current.TryFindResource("WD.QuestionGeometry");

From 26792f833c6a59ed71363aad8d5046753613b600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Fri, 20 Dec 2024 00:29:02 +0800
Subject: [PATCH 48/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#129=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#129）
---
 src/WPFDevelopers.Net40/Themes/Generic.xaml   | 153 +++++++++++++++--
 src/WPFDevelopers.Net40/Window.cs             |  29 ++++
 src/WPFDevelopers.Net45x/Themes/Generic.xaml  | 157 ++++++++++++++++--
 src/WPFDevelopers.Net45x/Window.cs            |  37 ++++-
 .../ExampleViews/MainWindow.xaml              |   1 +
 .../Window/HighTitleBarWindow.xaml            |  30 ++++
 .../Window/HighTitleBarWindow.xaml.cs         |  13 ++
 .../{ => Window}/NoChromeWindow.xaml          |   9 +-
 .../{ => Window}/NoChromeWindow.xaml.cs       |   2 +-
 .../{ => Window}/NoneNoChromeWindow.xaml      |   9 +-
 .../{ => Window}/NoneNoChromeWindow.xaml.cs   |   2 +-
 .../ExampleViews/Window/NormalWindow.xaml     |  27 +++
 .../ExampleViews/Window/NormalWindow.xaml.cs  |  14 ++
 .../ExampleViews/Window/WindowExample.xaml    |  53 ++++++
 .../ExampleViews/Window/WindowExample.xaml.cs |  35 ++++
 .../Helpers/MenuEnum.cs                       |   2 +
 .../ViewModels/MainVM.cs                      |   7 +-
 .../WPFDevelopers.Samples.Shared.projitems    |  29 +++-
 .../WPFDevelopers.SamplesCode.csproj          |  20 ++-
 .../Controls/TitleBarMode.cs                  |   8 +
 .../WPFDevelopers.Shared.projitems            |   1 +
 21 files changed, 590 insertions(+), 48 deletions(-)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml.cs
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{ => Window}/NoChromeWindow.xaml (90%)
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{ => Window}/NoChromeWindow.xaml.cs (88%)
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{ => Window}/NoneNoChromeWindow.xaml (91%)
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{ => Window}/NoneNoChromeWindow.xaml.cs (87%)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/TitleBarMode.cs

diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index 04a35980..7042df93 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -39,22 +39,142 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <control:SmallPanel Grid.Row="0" Background="{TemplateBinding TitleBackground}">
-                                <Grid x:Name="PART_GridChrome" Height="{TemplateBinding TitleHeight}">
+                            <control:SmallPanel
+                                x:Name="PART_Normal"
+                                Grid.Row="0"
+                                Background="{TemplateBinding TitleBackground}">
+                                <Grid Height="{TemplateBinding TitleHeight}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Button
+                                            x:Name="PART_TitleBarIcon"
+                                            Margin="5,0,0,0"
+                                            VerticalAlignment="Center"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Background="Transparent"
+                                            BorderThickness="0"
+                                            Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource ObjectNullToVisibilityConverter}}">
+                                            <Image
+                                                Width="{x:Static SystemParameters.SmallIconWidth}"
+                                                Height="{x:Static SystemParameters.SmallIconHeight}"
+                                                IsHitTestVisible="False"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                Source="{TemplateBinding Icon}" />
+                                        </Button>
+
+                                        <ContentControl
+                                            Margin="5,0,0,0"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding Title}"
+                                            FontSize="{DynamicResource {x:Static SystemFonts.CaptionFontSizeKey}}"
+                                            Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
+                                            IsTabStop="False" />
+                                    </StackPanel>
+                                    <StackPanel
+                                        Grid.Column="1"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Top"
+                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Orientation="Horizontal">
+                                        <StackPanel x:Name="PART_TitleBarMinAndMax" Orientation="Horizontal">
+                                            <Button
+                                                Name="PART_TitleBarMinimizeButton"
+                                                Padding="0"
+                                                Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
+                                                IsTabStop="False"
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                    <Rectangle
+                                                        Width="10"
+                                                        Height="1"
+                                                        Margin="0,7,0,0"
+                                                        VerticalAlignment="Bottom"
+                                                        Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
+                                                </Grid>
+                                            </Button>
+                                            <Button
+                                                Name="PART_TitleBarMaximizeButton"
+                                                Padding="0"
+                                                Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
+                                                IsTabStop="False"
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                    <Path
+                                                        Width="10"
+                                                        Height="10"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Data="{DynamicResource WD.WindowMaximizeGeometry}"
+                                                        Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                                        Stretch="Uniform"
+                                                        UseLayoutRounding="False" />
+                                                </Grid>
+                                            </Button>
+                                            <Button
+                                                Name="PART_TitleBarRestoreButton"
+                                                Padding="0"
+                                                Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
+                                                IsTabStop="False"
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
+                                                Visibility="Collapsed">
+                                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                    <Path
+                                                        Width="10"
+                                                        Height="10"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Data="{DynamicResource WD.WindowRestoreGeometry}"
+                                                        Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                                        Stretch="Uniform"
+                                                        UseLayoutRounding="False" />
+                                                </Grid>
+                                            </Button>
+                                        </StackPanel>
+
+                                        <Button
+                                            Name="PART_TitleBarCloseButton"
+                                            Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}"
+                                            ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+                                            <Path
+                                                Width="10"
+                                                Height="10"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{DynamicResource WD.WindowCloseGeometry}"
+                                                Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                                Stretch="Uniform" />
+                                        </Button>
+                                    </StackPanel>
+                                </Grid>
+                            </control:SmallPanel>
+                            <control:SmallPanel
+                                x:Name="PART_HighTitleBar"
+                                Grid.Row="0"
+                                Background="{TemplateBinding TitleBackground}"
+                                Visibility="Collapsed">
+                                <Grid
+                                    x:Name="PART_GridChrome"
+                                    Height="{TemplateBinding TitleHeight}"
+                                    Margin="10,0,0,0">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" MinWidth="30" />
                                     </Grid.ColumnDefinitions>
                                     <Image
-                                        Width="30"
-                                        Height="30"
-                                        Margin="14,0,0,0"
-                                        HorizontalAlignment="Left"
+                                        Width="23"
+                                        Height="23"
                                         VerticalAlignment="Center"
                                         RenderOptions.BitmapScalingMode="HighQuality"
                                         Source="{TemplateBinding Icon}"
-                                        Stretch="Fill"
                                         Visibility="{TemplateBinding Icon,
                                                                      Converter={StaticResource ObjectNullToVisibilityConverter}}" />
                                     <TextBlock
@@ -65,11 +185,12 @@
                                         FontSize="{DynamicResource WD.TitleFontSize}"
                                         Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
                                         Text="{TemplateBinding Title}" />
-                                    <WrapPanel
+                                    <StackPanel
                                         Grid.Column="2"
                                         Margin="0,6"
-                                        shell:WindowChrome.IsHitTestVisibleInChrome="True">
-                                        <WrapPanel x:Name="PART_MinAndMax">
+                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Orientation="Horizontal">
+                                        <StackPanel x:Name="PART_MinAndMax" Orientation="Horizontal">
                                             <Button
                                                 Name="PART_MinimizeButton"
                                                 Padding="0"
@@ -126,7 +247,7 @@
                                                         UseLayoutRounding="False" />
                                                 </Grid>
                                             </Button>
-                                        </WrapPanel>
+                                        </StackPanel>
 
                                         <Button
                                             Name="PART_CloseButton"
@@ -143,7 +264,7 @@
                                                 Fill="{DynamicResource WD.WindowForegroundColorBrush}"
                                                 Stretch="Uniform" />
                                         </Button>
-                                    </WrapPanel>
+                                    </StackPanel>
                                 </Grid>
                                 <ContentPresenter
                                     x:Name="PART_TitleToolBar"
@@ -165,18 +286,26 @@
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="TitleBarMode" Value="HighTitleBar">
+                            <Setter TargetName="PART_HighTitleBar" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_Normal" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
                         <Trigger Property="WindowState" Value="Maximized">
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_TitleBarRestoreButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_TitleBarMaximizeButton" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="PART_Border" Property="Margin" Value="7" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_TitleBarMinAndMax" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="NoChrome" Value="True">
                             <Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
                         </Trigger>
+
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
diff --git a/src/WPFDevelopers.Net40/Window.cs b/src/WPFDevelopers.Net40/Window.cs
index cb792f54..3f6e4189 100644
--- a/src/WPFDevelopers.Net40/Window.cs
+++ b/src/WPFDevelopers.Net40/Window.cs
@@ -2,16 +2,21 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using WPFDevelopers.Controls;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Net40
 {
+    [TemplatePart(Name = TitleBarIcon, Type = typeof(Button))]
     public class Window : System.Windows.Window
     {
+        private const string TitleBarIcon = "PART_TitleBarIcon";
         private WindowStyle _windowStyle;
+        private Button _titleBarIcon;
 
         public static readonly DependencyProperty TitleHeightProperty =
             DependencyProperty.Register("TitleHeight", typeof(double), typeof(Window), new PropertyMetadata(50d));
@@ -25,6 +30,9 @@ public class Window : System.Windows.Window
         public static readonly DependencyProperty TitleBackgroundProperty =
            DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(null));
 
+        public static readonly DependencyProperty TitleBarModeProperty =
+            DependencyProperty.Register("TitleBarMode", typeof(TitleBarMode), typeof(Window), new PropertyMetadata(TitleBarMode.Normal));
+
         static Window()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(typeof(Window)));
@@ -46,7 +54,20 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
             _windowStyle = WindowStyle;
+            _titleBarIcon = GetTemplateChild(TitleBarIcon) as Button;
+            if (_titleBarIcon != null)
+            {
+                _titleBarIcon.MouseDoubleClick -= Icon_MouseDoubleClick;
+                _titleBarIcon.MouseDoubleClick += Icon_MouseDoubleClick;
+            }
+        }
+
+        private void Icon_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+                Close();
         }
+
         public double TitleHeight
         {
             get => (double)GetValue(TitleHeightProperty);
@@ -71,10 +92,18 @@ public Brush TitleBackground
             set => SetValue(TitleBackgroundProperty, value);
         }
 
+        public TitleBarMode TitleBarMode
+        {
+            get => (TitleBarMode)GetValue(TitleBarModeProperty);
+            set => SetValue(TitleBarModeProperty, value);
+        }
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             hWnd = new WindowInteropHelper(this).Handle;
             HwndSource.FromHwnd(hWnd).AddHook(WindowProc);
+            if(TitleBarMode == TitleBarMode.Normal)
+                TitleHeight = SystemParameters2.Current.WindowNonClientFrameThickness.Top;
         }
 
         protected override void OnContentRendered(EventArgs e)
diff --git a/src/WPFDevelopers.Net45x/Themes/Generic.xaml b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
index b3e008ae..9c1840aa 100644
--- a/src/WPFDevelopers.Net45x/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
@@ -45,22 +45,142 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <control:SmallPanel Grid.Row="0" Background="{TemplateBinding TitleBackground}">
-                                <Grid x:Name="PART_GridChrome" Height="{TemplateBinding TitleHeight}">
+                            <control:SmallPanel
+                                x:Name="PART_Normal"
+                                Grid.Row="0"
+                                Background="{TemplateBinding TitleBackground}">
+                                <Grid Height="{TemplateBinding TitleHeight}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Button
+                                            x:Name="PART_TitleBarIcon"
+                                            Margin="5,0,0,0"
+                                            VerticalAlignment="Center"
+                                            Background="Transparent"
+                                            BorderThickness="0"
+                                            Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource ObjectNullToVisibilityConverter}}"
+                                            WindowChrome.IsHitTestVisibleInChrome="True">
+                                            <Image
+                                                Width="{x:Static SystemParameters.SmallIconWidth}"
+                                                Height="{x:Static SystemParameters.SmallIconHeight}"
+                                                IsHitTestVisible="False"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                Source="{TemplateBinding Icon}" />
+                                        </Button>
+                                        <ContentControl
+                                            Margin="5,0,0,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding Title}"
+                                            FontSize="{DynamicResource {x:Static SystemFonts.CaptionFontSizeKey}}"
+                                            Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
+                                            IsTabStop="False" />
+                                    </StackPanel>
+                                    <StackPanel
+                                        Grid.Column="1"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Top"
+                                        Orientation="Horizontal"
+                                        WindowChrome.IsHitTestVisibleInChrome="True">
+                                        <StackPanel x:Name="PART_TitleBarMinAndMax" Orientation="Horizontal">
+                                            <Button
+                                                Name="PART_TitleBarMinimizeButton"
+                                                Padding="0"
+                                                Command="SystemCommands.MinimizeWindowCommand"
+                                                IsTabStop="False"
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                    <Rectangle
+                                                        Width="10"
+                                                        Height="1"
+                                                        Margin="0,7,0,0"
+                                                        VerticalAlignment="Bottom"
+                                                        Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
+                                                </Grid>
+                                            </Button>
+                                            <Button
+                                                Name="PART_TitleBarMaximizeButton"
+                                                Padding="0"
+                                                Command="SystemCommands.MaximizeWindowCommand"
+                                                IsTabStop="False"
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                    <Path
+                                                        Width="10"
+                                                        Height="10"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Data="{DynamicResource WD.WindowMaximizeGeometry}"
+                                                        Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                                        Stretch="Uniform"
+                                                        UseLayoutRounding="False" />
+                                                </Grid>
+                                            </Button>
+                                            <Button
+                                                Name="PART_TitleBarRestoreButton"
+                                                Padding="0"
+                                                Command="SystemCommands.RestoreWindowCommand"
+                                                IsTabStop="False"
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
+                                                Visibility="Collapsed">
+                                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                    <Path
+                                                        Width="10"
+                                                        Height="10"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Data="{DynamicResource WD.WindowRestoreGeometry}"
+                                                        Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                                        Stretch="Uniform"
+                                                        UseLayoutRounding="False" />
+                                                </Grid>
+                                            </Button>
+                                        </StackPanel>
+
+                                        <Button
+                                            Name="PART_TitleBarCloseButton"
+                                            Command="SystemCommands.CloseWindowCommand"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}"
+                                            ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+                                            <Path
+                                                Width="10"
+                                                Height="10"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{DynamicResource WD.WindowCloseGeometry}"
+                                                Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                                Stretch="Uniform" />
+                                        </Button>
+                                    </StackPanel>
+                                </Grid>
+                            </control:SmallPanel>
+                            <control:SmallPanel
+                                x:Name="PART_HighTitleBar"
+                                Grid.Row="0"
+                                Background="{TemplateBinding TitleBackground}"
+                                Visibility="Collapsed">
+                                <Grid
+                                    x:Name="PART_GridChrome"
+                                    Height="{TemplateBinding TitleHeight}"
+                                    Margin="10,0,0,0">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" MinWidth="30" />
                                     </Grid.ColumnDefinitions>
                                     <Image
-                                        Width="30"
-                                        Height="30"
-                                        Margin="14,0,0,0"
-                                        HorizontalAlignment="Left"
+                                        Width="23"
+                                        Height="23"
                                         VerticalAlignment="Center"
                                         RenderOptions.BitmapScalingMode="HighQuality"
                                         Source="{TemplateBinding Icon}"
-                                        Stretch="Fill"
                                         Visibility="{TemplateBinding Icon,
                                                                      Converter={StaticResource ObjectNullToVisibilityConverter}}" />
                                     <TextBlock
@@ -71,11 +191,12 @@
                                         FontSize="{DynamicResource WD.TitleFontSize}"
                                         Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
                                         Text="{TemplateBinding Title}" />
-                                    <WrapPanel
+                                    <StackPanel
                                         Grid.Column="2"
                                         Margin="0,6"
+                                        Orientation="Horizontal"
                                         WindowChrome.IsHitTestVisibleInChrome="True">
-                                        <WrapPanel x:Name="PART_MinAndMax">
+                                        <StackPanel x:Name="PART_MinAndMax" Orientation="Horizontal">
                                             <Button
                                                 Name="PART_MinimizeButton"
                                                 Padding="0"
@@ -132,7 +253,7 @@
                                                         UseLayoutRounding="False" />
                                                 </Grid>
                                             </Button>
-                                        </WrapPanel>
+                                        </StackPanel>
 
                                         <Button
                                             Name="PART_CloseButton"
@@ -149,7 +270,7 @@
                                                 Fill="{DynamicResource WD.WindowForegroundColorBrush}"
                                                 Stretch="Uniform" />
                                         </Button>
-                                    </WrapPanel>
+                                    </StackPanel>
                                 </Grid>
                                 <ContentPresenter
                                     x:Name="PART_TitleToolBar"
@@ -167,17 +288,27 @@
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Bottom"
                                 IsTabStop="False"
-                                Visibility="Collapsed" />
+                                Visibility="Collapsed"
+                                WindowChrome.ResizeGripDirection="BottomRight" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="TitleBarMode" Value="HighTitleBar">
+                            <Setter TargetName="PART_HighTitleBar" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_Normal" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
                         <Trigger Property="WindowState" Value="Maximized">
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="PART_Border" Property="Margin" Value="7" />
+                            <Setter TargetName="PART_TitleBarRestoreButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_TitleBarMaximizeButton" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_Border" Property="BorderThickness" Value="0" />
+                            <Setter TargetName="PART_Border" Property="Padding" Value="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+                            <Setter TargetName="LayoutRoot" Property="Margin" Value="{x:Static SystemParameters.WindowResizeBorderThickness}" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_TitleBarMinAndMax" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="NoChrome" Value="True">
                             <Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
diff --git a/src/WPFDevelopers.Net45x/Window.cs b/src/WPFDevelopers.Net45x/Window.cs
index 3e0b7ca4..fc6f039d 100644
--- a/src/WPFDevelopers.Net45x/Window.cs
+++ b/src/WPFDevelopers.Net45x/Window.cs
@@ -1,16 +1,23 @@
-using System;
+using Standard;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using WPFDevelopers.Controls;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Net45x
 {
+    [TemplatePart(Name = TitleBarIcon, Type = typeof(Button))]
     public class Window : System.Windows.Window
     {
+        private const string TitleBarIcon = "PART_TitleBarIcon";
         private WindowStyle _windowStyle;
+        private Button _titleBarIcon;
 
         public static readonly DependencyProperty TitleHeightProperty =
             DependencyProperty.Register("TitleHeight", typeof(double), typeof(Window), new PropertyMetadata(50d));
@@ -24,6 +31,9 @@ public class Window : System.Windows.Window
         public static readonly DependencyProperty TitleBackgroundProperty =
           DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(null));
 
+        public static readonly DependencyProperty TitleBarModeProperty =
+           DependencyProperty.Register("TitleBarMode", typeof(TitleBarMode), typeof(Window), new PropertyMetadata(TitleBarMode.Normal));
+
         static Window()
         {
             StyleProperty.OverrideMetadata(typeof(Window),
@@ -45,28 +55,50 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
             _windowStyle = WindowStyle;
+            _titleBarIcon = GetTemplateChild(TitleBarIcon) as Button;
+            if (_titleBarIcon != null)
+            {
+                _titleBarIcon.MouseDoubleClick -= Icon_MouseDoubleClick;
+                _titleBarIcon.MouseDoubleClick += Icon_MouseDoubleClick;
+            }
         }
+
+        private void Icon_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+                Close();
+        }
+
         public double TitleHeight
         {
             get => (double)GetValue(TitleHeightProperty);
             set => SetValue(TitleHeightProperty, value);
         }
+
         public bool NoChrome
         {
             get => (bool)GetValue(NoChromeProperty);
             set => SetValue(NoChromeProperty, value);
         }
+
         public object TitleBar
         {
             get => (object)GetValue(TitleBarProperty);
             set => SetValue(TitleBarProperty, value);
         }
+
         public Brush TitleBackground
         {
             get => (Brush)GetValue(TitleBackgroundProperty);
             set => SetValue(TitleBackgroundProperty, value);
         }
 
+        public TitleBarMode TitleBarMode
+        {
+            get => (TitleBarMode)GetValue(TitleBarModeProperty);
+            set => SetValue(TitleBarModeProperty, value);
+        }
+
         private static T GetResourceKey<T>(string key)
         {
             if (Application.Current.TryFindResource(key) is T resource) return resource;
@@ -78,6 +110,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             hWnd = new WindowInteropHelper(this).Handle;
             HwndSource.FromHwnd(hWnd).AddHook(WindowProc);
+            if (TitleBarMode == TitleBarMode.Normal)
+                TitleHeight = SystemParameters.WindowNonClientFrameThickness.Top + SystemParameters.WindowResizeBorderThickness.Top; //32;//SystemParameters.WindowNonClientFrameThickness.Top;
         }
 
         protected override void OnContentRendered(EventArgs e)
@@ -171,4 +205,5 @@ private void ShowSystemMenu(object sender, ExecutedRoutedEventArgs e)
 
         #endregion
     }
+    
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
index da86b6c0..e202e5fa 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
@@ -16,6 +16,7 @@
     Width="{x:Static local:App.Wdith}"
     Height="{x:Static local:App.Height}"
     Icon="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico"
+    TitleBarMode="HighTitleBar"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <wd:Window.Effect>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml
new file mode 100644
index 00000000..255ede9e
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml
@@ -0,0 +1,30 @@
+<wd:Window
+    x:Class="WPFDevelopers.Samples.ExampleViews.HighTitleBarWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    Title="HighTitleBar"
+    Width="710"
+    Height="520"
+    BorderBrush="{DynamicResource WD.DangerPressedSolidColorBrush}"
+    Icon="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico"
+    TitleBackground="{DynamicResource WD.DangerPressedSolidColorBrush}"
+    TitleBarMode="HighTitleBar"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <Grid>
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="Content" />
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/HighTitleBarWindow.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/HighTitleBarWindow.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml.cs
new file mode 100644
index 00000000..400e2d6e
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/HighTitleBarWindow.xaml.cs
@@ -0,0 +1,13 @@
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    ///     HighTitleBarWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class HighTitleBarWindow
+    {
+        public HighTitleBarWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoChromeWindow.xaml
similarity index 90%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoChromeWindow.xaml
index 9ae4507c..bd9a4560 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoChromeWindow.xaml
@@ -7,13 +7,14 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     Title="NoChromeWindow"
-    Width="400"
-    Height="300"
+    Width="710"
+    Height="520"
     BorderBrush="Transparent"
     BorderThickness="0"
     NoChrome="True"
     ResizeMode="NoResize"
     TitleBackground="{DynamicResource WD.BackgroundSolidColorBrush}"
+    TitleBarMode="HighTitleBar"
     TitleHeight="30"
     WindowStartupLocation="CenterScreen"
     WindowStyle="ToolWindow"
@@ -56,8 +57,8 @@
                 Text="Content" />
         </Grid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoChromeWindow.xaml" CodeType="Xaml" />
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoChromeWindow.xaml.cs" CodeType="CSharp" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/NoChromeWindow.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/NoChromeWindow.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoChromeWindow.xaml.cs
similarity index 88%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoChromeWindow.xaml.cs
index 7f2c948f..bb36d33e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoChromeWindow.xaml.cs
@@ -3,7 +3,7 @@
 namespace WPFDevelopers.Samples.ExampleViews
 {
     /// <summary>
-    ///     Window1.xaml 的交互逻辑
+    ///     NoChromeWindow.xaml 的交互逻辑
     /// </summary>
     public partial class NoChromeWindow 
     {
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoneNoChromeWindow.xaml
similarity index 91%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoneNoChromeWindow.xaml
index 5020739e..90033573 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoneNoChromeWindow.xaml
@@ -7,12 +7,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     Title="NoChromeWindow"
-    Width="400"
-    Height="300"
+    Width="710"
+    Height="520"
     BorderBrush="{StaticResource WD.DangerSolidColorBrush}"
     BorderThickness="1"
     NoChrome="True"
     TitleBackground="{StaticResource WD.DangerSolidColorBrush}"
+    TitleBarMode="HighTitleBar"
     TitleHeight="30"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
@@ -57,8 +58,8 @@
                 Text="Content" />
         </Grid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoneNoChromeWindow.xaml" CodeType="Xaml" />
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoneNoChromeWindow.xaml.cs" CodeType="CSharp" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/NoneNoChromeWindow.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/NoneNoChromeWindow.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoneNoChromeWindow.xaml.cs
similarity index 87%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoneNoChromeWindow.xaml.cs
index 91b3b2c9..28d0c1f5 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NoneNoChromeWindow.xaml.cs
@@ -3,7 +3,7 @@
 namespace WPFDevelopers.Samples.ExampleViews
 {
     /// <summary>
-    ///     Window1.xaml 的交互逻辑
+    ///     NoneNoChromeWindow.xaml 的交互逻辑
     /// </summary>
     public partial class NoneNoChromeWindow
     {
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml
new file mode 100644
index 00000000..8bcd666a
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml
@@ -0,0 +1,27 @@
+<wd:Window
+    x:Class="WPFDevelopers.Samples.ExampleViews.NormalWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    Title="Normal"
+    Width="710"
+    Height="520"
+    Icon="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <Grid>
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="Content" />
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/NormalWindow.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Window/NormalWindow.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml.cs
new file mode 100644
index 00000000..5673fc64
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/NormalWindow.xaml.cs
@@ -0,0 +1,14 @@
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    ///     NormalWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class NormalWindow
+    {
+        public NormalWindow()
+        {
+            InitializeComponent();
+        } 
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml
new file mode 100644
index 00000000..e4d90e0c
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml
@@ -0,0 +1,53 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.WindowExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <Grid>
+            <UniformGrid
+                Grid.Row="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                wd:PanelHelper.Spacing="10"
+                Rows="2">
+                <TextBlock VerticalAlignment="Center" Text="TitleBarMode:" />
+                <Button
+                    Width="100"
+                    wd:ElementHelper.CornerRadius="3"
+                    Click="BtnNormal_Click"
+                    Content="Normal"
+                    Style="{DynamicResource WD.PrimaryButton}" />
+                <Button
+                    Width="100"
+                    wd:ElementHelper.CornerRadius="3"
+                    Click="BtnHighTitleBar_Click"
+                    Content="HighTitleBar"
+                    Style="{DynamicResource WD.SuccessDefaultButton}" />
+                <TextBlock VerticalAlignment="Center" Text="HighTitleBar &amp; NoChrome = True:" />
+                <Button
+                    wd:ElementHelper.CornerRadius="3"
+                    Click="Button_Click"
+                    Content="ToolWindow"
+                    Style="{DynamicResource WD.PrimaryButton}" />
+                <Button
+                    Margin="10,0"
+                    wd:ElementHelper.CornerRadius="3"
+                    Click="ButtonNone_Click"
+                    Content="NoneWindow"
+                    Style="{DynamicResource WD.DangerPrimaryButton}" />
+            </UniformGrid>
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BadgeExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BadgeExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml.cs
new file mode 100644
index 00000000..6deb894b
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Window/WindowExample.xaml.cs
@@ -0,0 +1,35 @@
+using System.Windows;
+using System.Windows.Controls;
+using WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// WindowExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class WindowExample : UserControl
+    {
+        public WindowExample()
+        {
+            InitializeComponent();
+        }
+
+        private void BtnHighTitleBar_Click(object sender, RoutedEventArgs e)
+        {
+            new HighTitleBarWindow().MaskShowDialog();
+        }
+        private void BtnNormal_Click(object sender, RoutedEventArgs e)
+        {
+            new NormalWindow().MaskShowDialog();
+        }
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            new NoChromeWindow().MaskShowDialog();
+        }
+
+        private void ButtonNone_Click(object sender, RoutedEventArgs e)
+        {
+            new NoneNoChromeWindow().MaskShowDialog();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index 68a18aba..26ca0f14 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -17,6 +17,8 @@ public enum MenuEnum
         CycleLoading,
         RollLoading,
         CutImage,
+        //CutImage,
+        Window,
         CropAvatar,
         AnimationAudio,
         AMap,
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index d003502e..6b193ed9 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -142,8 +142,11 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.RollLoading:
                     ControlPanel = new RollLoadingExample();
                     break;
-                case MenuEnum.CutImage:
-                    ControlPanel = new CutImageExample();
+                //case MenuEnum.CutImage:
+                //    ControlPanel = new CutImageExample();
+                //    break;
+                case MenuEnum.Window:
+                    ControlPanel = new WindowExample();
                     break;
                 case MenuEnum.CropAvatar:
                     ControlPanel = new CropAvatarExample();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 7771ddc7..399610b8 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -297,10 +297,13 @@
       <SubType>Code</SubType>
       <DependentUpon>MultiSelectSearchComboBoxExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NoChromeWindow.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\Window\HighTitleBarWindow.xaml.cs">
+      <DependentUpon>HighTitleBarWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\Window\NoChromeWindow.xaml.cs">
       <DependentUpon>NoChromeWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NoneNoChromeWindow.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\Window\NoneNoChromeWindow.xaml.cs">
       <DependentUpon>NoneNoChromeWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NotifyIconExample.xaml.cs">
@@ -455,6 +458,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\WaterfallPanelExample.xaml.cs">
       <DependentUpon>WaterfallPanelExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\Window\NormalWindow.xaml.cs">
+      <DependentUpon>NormalWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\Window\WindowExample.xaml.cs">
+      <DependentUpon>WindowExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ZooSemy\VolumeControl.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>VolumeControl.xaml</DependentUpon>
@@ -813,11 +822,15 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\NoChromeWindow.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\Window\HighTitleBarWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\Window\NoChromeWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\NoneNoChromeWindow.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\Window\NoneNoChromeWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -977,6 +990,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\Window\NormalWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\Window\WindowExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ZooSemy\VolumeControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 5fbb02b5..2f1887c9 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -134,8 +134,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropImageExample.xaml.cs" Link="ExampleViews\CropImageExample.xaml.cs" DependentUpon="CropImageExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BadgeExample.xaml.cs" Link="ExampleViews\BadgeExample.xaml.cs" DependentUpon="BadgeExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\MessageExample.xaml.cs" Link="ExampleViews\MessageExample.xaml.cs" DependentUpon="MessageExample.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoChromeWindow.xaml.cs" Link="ExampleViews\NoChromeWindow.xaml.cs" DependentUpon="NoChromeWindow.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoneNoChromeWindow.xaml.cs" Link="ExampleViews\NoneNoChromeWindow.xaml.cs" DependentUpon="NoneNoChromeWindow.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\NoChromeWindow.xaml.cs" Link="ExampleViews\Window\NoChromeWindow.xaml.cs" DependentUpon="NoChromeWindow.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\NoneNoChromeWindow.xaml.cs" Link="ExampleViews\Window\NoneNoChromeWindow.xaml.cs" DependentUpon="NoneNoChromeWindow.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\PathIconExample.xaml.cs" Link="ExampleViews\PathIconExample.xaml.cs" DependentUpon="PathIconExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NumericBoxExample.xaml.cs" Link="ExampleViews\NumericBoxExample.xaml.cs" DependentUpon="NumericBoxExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ColorPickerExample.xaml.cs" Link="ExampleViews\ColorPickerExample.xaml.cs" DependentUpon="ColorPickerExample.xaml" />
@@ -150,6 +150,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\DateRangePickerExample.xaml.cs" Link="ExampleViews\DateRangePickerExample.xaml.cs" DependentUpon="DateRangePickerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml.cs" Link="ExampleViews\SpacingExample.xaml.cs" DependentUpon="SpacingExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml.cs" Link="ExampleViews\NotifyIconExample.xaml.cs" DependentUpon="NotifyIconExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\NormalWindow.xaml.cs" Link="ExampleViews\Window\NormalWindow.xaml.cs" DependentUpon="NormalWindow.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\HighTitleBarWindow.xaml.cs" Link="ExampleViews\Window\HighTitleBarWindow.xaml.cs" DependentUpon="HighTitleBarWindow.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -467,11 +469,11 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\MessageExample.xaml">
 			<Link>ExampleViews\MessageExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoChromeWindow.xaml">
-			<Link>ExampleViews\NoChromeWindow.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\NoChromeWindow.xaml">
+			<Link>ExampleViews\Window\NoChromeWindow.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoneNoChromeWindow.xaml">
-			<Link>ExampleViews\NoneNoChromeWindow.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\NoneNoChromeWindow.xaml">
+			<Link>ExampleViews\Window\NoneNoChromeWindow.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\PathIconExample.xaml">
 			<Link>ExampleViews\PathIconExample.xaml</Link>
@@ -512,5 +514,11 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml">
 			<Link>ExampleViews\NotifyIconExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\HighTitleBarWindow.xaml">
+			<Link>ExampleViews\Window\HighTitleBarWindow.xaml</Link>
+		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\NormalWindow.xaml">
+			<Link>ExampleViews\Window\NormalWindow.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Controls/TitleBarMode.cs b/src/WPFDevelopers.Shared/Controls/TitleBarMode.cs
new file mode 100644
index 00000000..5aeff750
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/TitleBarMode.cs
@@ -0,0 +1,8 @@
+namespace WPFDevelopers.Controls
+{
+    public enum TitleBarMode
+    {
+        Normal,
+        HighTitleBar
+    }
+}
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 1c776717..1140a197 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -35,6 +35,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelectorItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelectorListBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\TitleBarMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Assists\ThincknessAssert.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Badge\Badge.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBar.cs" />

From 9be69cd24751ff4fe9ffb3a1889a3a95cd159c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Fri, 20 Dec 2024 00:29:33 +0800
Subject: [PATCH 49/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#128=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#128）
---
 src/WPFDevelopers.Shared/Themes/Theme40.txt  | 2 +-
 src/WPFDevelopers.Shared/Themes/Theme45x.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index 8ead9141..39d174af 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -44,8 +44,8 @@ BallLoading.xaml
 BreathLamp.xaml
 Carousel.xaml
 VerifyCode.xaml
-CircularProgressBar.xaml
 CircleMenu.xaml
+CircleProgressBar.xaml
 EdgeLight.xaml
 LoadingGroup.xaml
 Pagination.xaml
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 47e1f768..fb6070b2 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -45,8 +45,8 @@ BallLoading.xaml
 BreathLamp.xaml
 Carousel.xaml
 VerifyCode.xaml
-CircularProgressBar.xaml
 CircleMenu.xaml
+CircleProgressBar.xaml
 EdgeLight.xaml
 LoadingGroup.xaml
 Pagination.xaml

From fd1b84e35b76d1869b239a7bf6fb24427459d781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 26 Dec 2024 18:57:54 +0800
Subject: [PATCH 50/51] Update CircleProgressBar.cs

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

diff --git a/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs b/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
index c3391d4d..763a5e62 100644
--- a/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
+++ b/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
@@ -25,7 +25,7 @@ public class CircleProgressBar : ProgressBar
 
         public static readonly DependencyProperty IsRoundProperty =
             DependencyProperty.Register("IsRound", typeof(bool), typeof(CircleProgressBar),
-                new PropertyMetadata(false));
+                new PropertyMetadata(true));
 
         public static readonly DependencyProperty AngleProperty =
             DependencyProperty.Register("Angle", typeof(double), typeof(CircleProgressBar),

From ab44e3bec93ad91022800b8889ad7390018604dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 26 Dec 2024 20:04:08 +0800
Subject: [PATCH 51/51] =?UTF-8?q?Fix=20issue=20=EF=BC=88#127=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#127 ）
---
 .../ExampleViews/GaugeExample.xaml            |  91 ++++++++++
 .../ExampleViews/GaugeExample.xaml.cs         |  15 ++
 .../Helpers/MenuEnum.cs                       |   1 +
 .../ViewModels/MainVM.cs                      |   3 +
 .../WPFDevelopers.Samples.Shared.projitems    |   7 +
 .../WPFDevelopers.SamplesCode.csproj          |   4 +
 .../Controls/Gauge/Gauge.cs                   | 169 ++++++++++++++++++
 .../WPFDevelopers.Shared.projitems            |   1 +
 8 files changed, 291 insertions(+)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Gauge/Gauge.cs

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml
new file mode 100644
index 00000000..8d8719b3
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml
@@ -0,0 +1,91 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.GaugeExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <StackPanel VerticalAlignment="Bottom">
+                <wd:Gauge
+                    Title="Min"
+                    Width="100"
+                    Height="100"
+                    Margin="10"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Background="Black"
+                    BorderBrush="Red"
+                    FontSize="8"
+                    Maximum="90"
+                    Minimum="30"
+                    Thickness="3"
+                    ValueFormat="{}{0:0}值"
+                    Value="{Binding ElementName=MySlider2, Path=Value}" />
+                <Slider
+                    Name="MySlider2"
+                    Width="200"
+                    Margin="0,0,0,20"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    Maximum="90"
+                    Minimum="30" />
+            </StackPanel>
+
+            <StackPanel>
+                <wd:Gauge
+                    Title="反对率"
+                    Width="200"
+                    Height="200"
+                    Margin="10"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    ValueFormat="{}{0:0}%"
+                    Value="{Binding ElementName=MySlider, Path=Value}" />
+                <Slider
+                    Name="MySlider"
+                    Width="200"
+                    Margin="0,0,0,20"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    Maximum="100"
+                    Minimum="0" />
+            </StackPanel>
+            <StackPanel VerticalAlignment="Bottom">
+                <wd:Gauge
+                    Title="Max"
+                    Width="100"
+                    Height="100"
+                    Margin="10"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Background="Black"
+                    BorderBrush="DodgerBlue"
+                    FontSize="8"
+                    Maximum="90"
+                    Minimum="30"
+                    Thickness="3"
+                    ValueFormat="{}{0:0}值"
+                    Value="{Binding ElementName=MySlider3, Path=Value}" />
+                <Slider
+                    Name="MySlider3"
+                    Width="200"
+                    Margin="0,0,0,20"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    Maximum="90"
+                    Minimum="30" />
+            </StackPanel>
+        </WrapPanel>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/GaugeExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/GaugeExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml.cs
new file mode 100644
index 00000000..c142337f
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/GaugeExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// GaugeExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class GaugeExample : UserControl
+    {
+        public GaugeExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index 26ca0f14..11e00581 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -89,6 +89,7 @@ public enum MenuEnum
         Spacing,
         Drawer,
         DateRangePicker,
+        Gauge,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 6b193ed9..27eda91e 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -367,6 +367,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.DateRangePicker:
                     ControlPanel = new DateRangePickerExample();
                     break;
+                case MenuEnum.Gauge:
+                    ControlPanel = new GaugeExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 399610b8..40fb2871 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -207,6 +207,9 @@
       <SubType>Code</SubType>
       <DependentUpon>EdgeLightExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\GaugeExample.xaml.cs">
+      <DependentUpon>GaugeExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\IPEditBoxExample.xaml.cs">
       <DependentUpon>IPEditBoxExample.xaml</DependentUpon>
     </Compile>
@@ -713,6 +716,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\GaugeExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\IPEditBoxExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 2f1887c9..20ec7fcc 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -150,6 +150,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\DateRangePickerExample.xaml.cs" Link="ExampleViews\DateRangePickerExample.xaml.cs" DependentUpon="DateRangePickerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml.cs" Link="ExampleViews\SpacingExample.xaml.cs" DependentUpon="SpacingExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml.cs" Link="ExampleViews\NotifyIconExample.xaml.cs" DependentUpon="NotifyIconExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\GaugeExample.xaml.cs" Link="ExampleViews\GaugeExample.xaml.cs" DependentUpon="GaugeExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\NormalWindow.xaml.cs" Link="ExampleViews\Window\NormalWindow.xaml.cs" DependentUpon="NormalWindow.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\HighTitleBarWindow.xaml.cs" Link="ExampleViews\Window\HighTitleBarWindow.xaml.cs" DependentUpon="HighTitleBarWindow.xaml" />
 	</ItemGroup>
@@ -514,6 +515,9 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml">
 			<Link>ExampleViews\NotifyIconExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\GaugeExample.xaml">
+			<Link>ExampleViews\GaugeExample.xaml</Link>
+		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Window\HighTitleBarWindow.xaml">
 			<Link>ExampleViews\Window\HighTitleBarWindow.xaml</Link>
 		</Resource>
diff --git a/src/WPFDevelopers.Shared/Controls/Gauge/Gauge.cs b/src/WPFDevelopers.Shared/Controls/Gauge/Gauge.cs
new file mode 100644
index 00000000..4839eb9c
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Gauge/Gauge.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace WPFDevelopers.Controls
+{
+    public class Gauge : RangeBase
+    {
+        public string Title
+        {
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
+        }
+
+        public static readonly DependencyProperty TitleProperty =
+            DependencyProperty.Register("TitleProperty", typeof(string), typeof(Gauge), new PropertyMetadata("WD"));
+
+        public static readonly DependencyProperty ValueFormatProperty =
+       DependencyProperty.Register("ValueFormat", typeof(string), typeof(Gauge),
+           new PropertyMetadata("{0:0}%", OnValueFormatChanged));
+
+        private static void OnValueFormatChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var gauge = d as Gauge;
+            gauge?.InvalidateVisual();
+        }
+
+        public string ValueFormat
+        {
+            get { return (string)GetValue(ValueFormatProperty); }
+            set { SetValue(ValueFormatProperty, value); }
+        }
+        public double Thickness
+        {
+            get { return (double)GetValue(ThicknessProperty); }
+            set { SetValue(ThicknessProperty, value); }
+        }
+
+        public static readonly DependencyProperty ThicknessProperty =
+            DependencyProperty.Register("Thickness", typeof(double), typeof(Gauge), new PropertyMetadata(10.0, OnValueFormatChanged));
+
+
+        static Gauge()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(Gauge), new FrameworkPropertyMetadata(typeof(Gauge)));
+        }
+
+        public Gauge()
+        {
+            SetValue(ValueProperty, 0.0);
+            SetValue(MinimumProperty, 0.0);
+            SetValue(MaximumProperty, 100.0);
+        }
+
+        protected override void OnValueChanged(double oldValue, double newValue)
+        {
+            InvalidateVisual();
+        }
+
+        protected override void OnMinimumChanged(double oldValue, double newValue)
+        {
+            InvalidateVisual();
+        }
+
+        protected override void OnMaximumChanged(double oldValue, double newValue)
+        {
+            InvalidateVisual();
+        }
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+            if (Background == null)
+                Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#293950"));
+            var width = ActualWidth;
+            var height = ActualHeight;
+            var radius = Math.Min(width, height) / 2;
+            drawingContext.DrawEllipse(Background, new Pen(Background, Thickness), new Point(width / 2, height / 2), radius, radius);
+            var normalizedValue = (Value - Minimum) / (Maximum - Minimum);
+            var mappedAngle = -220 + normalizedValue * 260;
+            var angleInRadians = mappedAngle * Math.PI / 180;
+            var pointerLength = radius * 0.7;
+            var pointerX = width / 2 + pointerLength * Math.Cos(angleInRadians);
+            var pointerY = height / 2 + pointerLength * Math.Sin(angleInRadians);
+            drawingContext.DrawLine(new Pen(Brushes.Red, 2), new Point(width / 2, height / 2), new Point(pointerX, pointerY));
+            drawingContext.DrawEllipse(Brushes.White, new Pen(Brushes.Red, 2), new Point(width / 2, height / 2), width / 20, width / 20);
+            var pathGeometry = new PathGeometry();
+            var startAngle = -220;
+            angleInRadians = startAngle * Math.PI / 180;
+            var startX = width / 2 + radius * Math.Cos(angleInRadians);
+            var startY = height / 2 + radius * Math.Sin(angleInRadians);
+
+            var pathFigure = new PathFigure()
+            {
+                StartPoint = new Point(startX, startY),
+            };
+
+            var endAngle = 40;
+            angleInRadians = endAngle * Math.PI / 180;
+            var endX = width / 2 + radius * Math.Cos(angleInRadians);
+            var endY = height / 2 + radius * Math.Sin(angleInRadians);
+
+            var isLargeArc = (endAngle - startAngle > 180);
+            var arcSegment = new ArcSegment()
+            {
+                Point = new Point(endX, endY),
+                Size = new Size(radius, radius),
+                RotationAngle = 0,
+                SweepDirection = SweepDirection.Clockwise,
+                IsLargeArc = isLargeArc,
+            };
+
+            pathFigure.Segments.Add(arcSegment);
+            pathGeometry.Figures.Add(pathFigure);
+            if (BorderBrush == null)
+            {
+                var gradientBrush = new LinearGradientBrush
+                {
+                    StartPoint = new Point(0, 0),
+                    EndPoint = new Point(1, 0)
+                };
+                gradientBrush.GradientStops.Add(new GradientStop((Color)ColorConverter.ConvertFromString("#37D2C2"), 0.0));
+                gradientBrush.GradientStops.Add(new GradientStop((Color)ColorConverter.ConvertFromString("#5AD2B2"), 0.01));
+                gradientBrush.GradientStops.Add(new GradientStop((Color)ColorConverter.ConvertFromString("#B77D29"), 0.49));
+                gradientBrush.GradientStops.Add(new GradientStop(Colors.Red, 1.0));
+                gradientBrush.Freeze();
+                BorderBrush = gradientBrush;
+            }
+            drawingContext.DrawGeometry(null, new Pen(BorderBrush, Thickness), pathGeometry);
+            var tickLength = radius * 0.1; 
+            var step = (Maximum - Minimum) / 10;
+            for (int i = 0; i <= 10; i++)
+            {
+                var angle = startAngle + (i * (endAngle - startAngle) / 10);
+                var tickStartX = width / 2 + (radius - tickLength) * Math.Cos(angle * Math.PI / 180);
+                var tickStartY = height / 2 + (radius - tickLength) * Math.Sin(angle * Math.PI / 180);
+                var tickEndX = width / 2 + (radius + Thickness / 2) * Math.Cos(angle * Math.PI / 180);
+                var tickEndY = height / 2 + (radius + Thickness / 2) * Math.Sin(angle * Math.PI / 180);
+                drawingContext.DrawLine(new Pen(Brushes.White, 2), new Point(tickStartX, tickStartY), new Point(tickEndX, tickEndY));
+
+                var labelValue = Minimum + step * i;
+                var formattedText = DrawingContextHelper.GetFormattedText(labelValue.ToString(),Brushes.White, FlowDirection.LeftToRight,FontSize);
+
+                var labelRadius = radius - tickLength * 2;
+                var labelX = width / 2 + labelRadius * Math.Cos(angle * Math.PI / 180) - formattedText.Width / 2;
+                var labelY = height / 2 + labelRadius * Math.Sin(angle * Math.PI / 180) - formattedText.Height / 2;
+                drawingContext.DrawText(formattedText, new Point(labelX, labelY));
+            }
+            var formattedValue = "{0:0}%";
+            try
+            {
+                formattedValue = string.Format(ValueFormat, Value);
+            }
+            catch (FormatException ex)
+            {
+                throw new InvalidOperationException("Formatting failed ", ex);
+            }
+            var currentValueText = DrawingContextHelper.GetFormattedText(formattedValue, Brushes.White, FlowDirection.LeftToRight, FontSize * 2);
+            var valueX = width / 2 - currentValueText.Width / 2;
+            var valueY = height / 2 + radius * 0.4; 
+            drawingContext.DrawText(currentValueText, new Point(valueX, valueY));
+            var titleValue = DrawingContextHelper.GetFormattedText(Title, Brushes.White, FlowDirection.LeftToRight, FontSize);
+            valueX = width / 2 - titleValue.Width / 2;
+            valueY = height / 2 + radius * 0.8;
+            drawingContext.DrawText(titleValue, new Point(valueX, valueY));
+        }
+
+    }
+}
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 1140a197..dfd16bf8 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -22,6 +22,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DateRangePicker\DateRangePicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Drawer\Drawer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Gauge\Gauge.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\IPEditBox\IPEditBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\LoadingBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\LoadingExt.cs" />