add HatchBrushGenerator

src/Shared/HandyControlDemo_Shared/App.xaml

@@ -42,6 +42,11 @@
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
 
+            <ObjectDataProvider x:Key="HatchStyles" MethodName="GetValues" ObjectType="sys:Enum">
+                <ObjectDataProvider.MethodParameters>
+                    <x:Type Type="hc:HatchStyle"/>
+                </ObjectDataProvider.MethodParameters>
+            </ObjectDataProvider>
         </ResourceDictionary>
 
     </Application.Resources>

src/Shared/HandyControlDemo_Shared/App.xaml.cs

@@ -53,16 +53,6 @@ namespace HandyControlDemo
                 Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
             });
             Current.MainWindow?.OnApplyTemplate();
-
-            Resources.MergedDictionaries.Clear();
-            Resources.MergedDictionaries.Add(new ResourceDictionary
-            {
-                Source = new Uri($"pack://application:,,,/HandyControl;component/Themes/Skin{skin.ToString()}.xaml")
-            });
-            Resources.MergedDictionaries.Add(new ResourceDictionary
-            {
-                Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml")
-            });
         }
     }
 }

src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs

@@ -2,6 +2,8 @@
 {
 	public class MessageToken
     {
+		/*-------------------- Controls --------------------*/
+
         public static readonly string GrowlDemoCtl = nameof(GrowlDemoCtl);
 	
         public static readonly string LoadingDemoCtl = nameof(LoadingDemoCtl);
@@ -118,7 +120,13 @@
 	
         public static readonly string SplitButtonDemoCtl = nameof(SplitButtonDemoCtl);
 	
-        public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
+    	/*-------------------- Tools --------------------*/
+
+	    public static readonly string HatchBrushGeneratorDemoCtl = nameof(HatchBrushGeneratorDemoCtl);
+
+    	/*-------------------- Styles --------------------*/
+
+	    public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
 
         public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl);
 
@@ -174,11 +182,15 @@
 
         public static readonly string LabelDemoCtl = nameof(LabelDemoCtl);
 
-        public static readonly string CommonWindow = nameof(CommonWindow);
+    	/*-------------------- Windows --------------------*/
+
+	    public static readonly string CommonWindow = nameof(CommonWindow);
 
         public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow);
 
-        public static readonly string LoadShowContent = nameof(LoadShowContent);
+    	/*-------------------- Messages --------------------*/
+
+	    public static readonly string LoadShowContent = nameof(LoadShowContent);
 
         public static readonly string FullSwitch = nameof(FullSwitch);
 

src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt

@@ -94,6 +94,10 @@ var styleList = new List<string>
 	"ToolBarDemoCtl",
 	"LabelDemoCtl"
 };
+var toolList = new List<string>
+{
+	"HatchBrushGeneratorDemoCtl"
+};
 var windowList = new List<string>
 {
 	"CommonWindow",
@@ -120,19 +124,33 @@ namespace HandyControlDemo.Data
 {
 	public class MessageToken
     {
+		/*-------------------- Controls --------------------*/
+
     <#foreach(var item in controlList){#>
     public static readonly string <#=item#> = nameof(<#=item#>);
 	
     <#}#>
-<#foreach(var item in styleList){#>
+	/*-------------------- Tools --------------------*/
+
+	<#foreach(var item in toolList){#>
     public static readonly string <#=item#> = nameof(<#=item#>);
 
     <#}#>
-<#foreach(var item in windowList){#>
+	/*-------------------- Styles --------------------*/
+
+	<#foreach(var item in styleList){#>
     public static readonly string <#=item#> = nameof(<#=item#>);
 
     <#}#>
-<#foreach(var item in messageList){#>
+	/*-------------------- Windows --------------------*/
+
+	<#foreach(var item in windowList){#>
+    public static readonly string <#=item#> = nameof(<#=item#>);
+
+    <#}#>
+	/*-------------------- Messages --------------------*/
+
+	<#foreach(var item in messageList){#>
     public static readonly string <#=item#> = nameof(<#=item#>);
 
     <#}#>

src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems

@@ -27,6 +27,7 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Service\Data\DataService.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\HatchBrushConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\String2BrushConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\StringRepeatConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\AssemblyHelper.cs" />
@@ -327,6 +328,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\TreeViewDemoCtl.xaml.cs">
       <DependentUpon>TreeViewDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml.cs">
+      <DependentUpon>HatchBrushGeneratorDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Basic\ChatBoxViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Basic\InteractiveDialogViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Common\ComboBoxDemoViewModel.cs" />
@@ -817,6 +821,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Window\AboutWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs

@@ -690,6 +690,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 阴影画笔生成器 的本地化字符串。
+        /// </summary>
+        public static string HatchBrushGenerator {
+            get {
+                return ResourceManager.GetString("HatchBrushGenerator", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 蜂窝布局 的本地化字符串。
         /// </summary>
@@ -1617,6 +1626,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 工具 的本地化字符串。
+        /// </summary>
+        public static string Tools {
+            get {
+                return ResourceManager.GetString("Tools", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 穿梭框 的本地化字符串。
         /// </summary>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx

@@ -666,4 +666,10 @@
   <data name="SplitButton" xml:space="preserve">
     <value>SplitButton</value>
   </data>
+  <data name="Tools" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+  <data name="HatchBrushGenerator" xml:space="preserve">
+    <value>HatchBrushGenerator</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx

@@ -666,4 +666,10 @@
   <data name="SplitButton" xml:space="preserve">
     <value>SplitButton</value>
   </data>
+  <data name="Tools" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+  <data name="HatchBrushGenerator" xml:space="preserve">
+    <value>HatchBrushGenerator</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx

@@ -666,4 +666,10 @@
   <data name="SplitButton" xml:space="preserve">
     <value>SplitButton</value>
   </data>
+  <data name="Tools" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+  <data name="HatchBrushGenerator" xml:space="preserve">
+    <value>HatchBrushGenerator</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx

@@ -666,4 +666,10 @@
   <data name="SplitButton" xml:space="preserve">
     <value>分割按钮</value>
   </data>
+  <data name="Tools" xml:space="preserve">
+    <value>工具</value>
+  </data>
+  <data name="HatchBrushGenerator" xml:space="preserve">
+    <value>阴影画笔生成器</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Converters.xaml

@@ -4,5 +4,6 @@
 
     <converter:StringRepeatConverter x:Key="StringRepeatConverter"/>
     <converter:String2BrushConverter x:Key="String2BrushConverter"/>
+    <converter:HatchBrushConverter x:Key="HatchBrushConverter"/>
 
 </ResourceDictionary>

src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+using HandyControl.Data;
+using HandyControl.Tools;
+
+namespace HandyControlDemo.Tools.Converter
+{
+    public class HatchBrushConverter : IValueConverter
+    {
+        private readonly HatchBrushGenerator _brushGenerator;
+
+        public HatchBrushConverter()
+        {
+            _brushGenerator = new HatchBrushGenerator();
+        }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is HatchStyle style)
+            {
+                return _brushGenerator.GetHatchBrush(style, ResourceHelper.GetResource<Color>("DarkPrimaryColor"), ResourceHelper.GetResource<Color>("BackgroundColor"));
+            }
+            return Brushes.Transparent;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml

@@ -26,8 +26,8 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <hc:SearchBar SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4" Tag="{Binding ElementName=ListBoxStyle, Mode=OneWay}"/>
-                    <ToggleButton Name="ButtonStyleAscending" Click="ButtonStyleAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
+                    <hc:SearchBar SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4" Tag="{Binding ElementName=ListBoxStyle}"/>
+                    <ToggleButton Tag="{Binding ElementName=ListBoxStyle}" Name="ButtonStyleAscending" Click="ButtonAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
                         <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
                             <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
                         </Border>
@@ -185,8 +185,8 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <hc:SearchBar SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4" Tag="{Binding ElementName=ListBoxControl, Mode=OneWay}"/>
-                    <ToggleButton Name="ButtonControlAscending" Click="ButtonControlAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
+                    <hc:SearchBar SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4" Tag="{Binding ElementName=ListBoxControl}"/>
+                    <ToggleButton Tag="{Binding ElementName=ListBoxControl}" Name="ButtonControlAscending" Click="ButtonAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
                         <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
                             <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
                         </Border>
@@ -478,6 +478,34 @@
                     </ListBox>
                 </Grid>
             </TabItem>
+            <TabItem Background="Transparent" Header="{x:Static langs:Lang.Tools}">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <hc:SearchBar SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4" Tag="{Binding ElementName=ListBoxStyle}"/>
+                    <ToggleButton Tag="{Binding ElementName=ListBoxTool}" Name="ButtonToolAscending" Click="ButtonAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
+                        <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
+                            <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
+                        </Border>
+                        <hc:StatusSwitchElement.CheckedElement>
+                            <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
+                        </hc:StatusSwitchElement.CheckedElement>
+                    </ToggleButton>
+                    <ListBox Name="ListBoxTool" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
+                        <ListBoxItem Tag="{x:Static data:MessageToken.HatchBrushGeneratorDemoCtl}" Content="{x:Static langs:Lang.HatchBrushGenerator}">
+                            <hc:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/DataGenerator_16x.png"/>
+                            </hc:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                    </ListBox>
+                </Grid>
+            </TabItem>
         </TabControl>
     </DockPanel>
 </Border>

src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs

@@ -2,7 +2,9 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using HandyControl.Data;
+using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
 
@@ -28,7 +30,8 @@ namespace HandyControlDemo.UserControl
         private void TabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (e.AddedItems.Count == 0) return;
-            if (e.AddedItems[0] is TabItem tabItem && tabItem.Content is ListBox listBox)
+            if (e.AddedItems[0] is TabItem tabItem && 
+                VisualHelper.GetChild<ListBox>(tabItem.Content as DependencyObject) is ListBox listBox)
             {
                 if (listBox.SelectedItem != null)
                 {
@@ -39,27 +42,18 @@ namespace HandyControlDemo.UserControl
             }
         }
 
-        private void ButtonStyleAscending_OnClick(object sender, RoutedEventArgs e)
+        private void ButtonAscending_OnClick(object sender, RoutedEventArgs e)
         {
-            if (ButtonStyleAscending.IsChecked == true)
+            if (sender is ToggleButton button && button.Tag is ItemsControl itemsControl)
             {
-                ListBoxStyle.Items.SortDescriptions.Add(new SortDescription("Content", ListSortDirection.Ascending));
-            }
-            else
-            {
-                ListBoxStyle.Items.SortDescriptions.Clear();
-            }
-        }
-
-        private void ButtonControlAscending_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ButtonControlAscending.IsChecked == true)
-            {
-                ListBoxControl.Items.SortDescriptions.Add(new SortDescription("Content", ListSortDirection.Ascending));
-            }
-            else
-            {
-                ListBoxControl.Items.SortDescriptions.Clear();
+                if (button.IsChecked == true)
+                {
+                    itemsControl.Items.SortDescriptions.Add(new SortDescription("Content", ListSortDirection.Ascending));
+                }
+                else
+                {
+                    itemsControl.Items.SortDescriptions.Clear();
+                }
             }
         }
 

src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml

@@ -0,0 +1,11 @@
+<UserControl x:Class="HandyControlDemo.UserControl.HatchBrushGeneratorDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             Background="{DynamicResource RegionBrush}">
+    <hc:TransitioningContentControl>
+        <Border Style="{StaticResource BorderRegion}" Margin="32" Background="{Binding SelectedValue,ElementName=ComboBoxDemo,Converter={StaticResource HatchBrushConverter}}">
+            <ComboBox SelectedIndex="0" VerticalAlignment="Center" Name="ComboBoxDemo" Width="180" ItemsSource="{Binding Source={StaticResource HatchStyles}}"/>
+        </Border>
+    </hc:TransitioningContentControl>
+</UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs

@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class HatchBrushGeneratorDemoCtl
+    {
+        public HatchBrushGeneratorDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}