From 004cb69877fa45d37f99153f5a86fd8b753cc91d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 28 Nov 2021 13:42:52 +0800
Subject: [PATCH] feat(style): add TreeView small style

---
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml |  5 ++--
 .../HandyControl_Net_40/Themes/Theme.xaml     | 12 ++++++++--
 .../UserControl/Styles/TreeViewDemoCtl.xaml   | 23 +++++++++++++------
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml |  5 ++--
 .../Themes/Styles/TreeView.xaml               | 12 +++++++++-
 .../HandyControl_Shared/Themes/Theme.xaml     | 12 ++++++++--
 6 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 0d3c3fb4..101d1183 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -36,13 +36,14 @@
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeViewItem">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition MinHeight="{StaticResource DefaultControlHeight}"/>
-                            <RowDefinition/>
+                            <RowDefinition MinHeight="{TemplateBinding MinHeight}"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
                             <DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 63811432..941e08d1 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -11535,13 +11535,14 @@
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="Padding" Value="10,0" />
 		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeViewItem">
 					<Grid>
 						<Grid.RowDefinitions>
-							<RowDefinition MinHeight="{StaticResource DefaultControlHeight}" />
-							<RowDefinition />
+							<RowDefinition MinHeight="{TemplateBinding MinHeight}" />
+							<RowDefinition Height="Auto" />
 						</Grid.RowDefinitions>
 						<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
 							<DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
@@ -13269,6 +13270,13 @@
 	<Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
 	<Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
 	<Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
+	<Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
+		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />
+	</Style>
 	<Style BasedOn="{StaticResource WatermarkBaseStyle}" TargetType="hc:Watermark" />
 	<Style BasedOn="{StaticResource AutoCompleteTextBoxBaseStyle}" TargetType="hc:AutoCompleteTextBox" />
 	<ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
index 606acf90..949b299b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
@@ -4,12 +4,21 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <TreeView Width="200" Margin="32" ItemsSource="{Binding DataList}">
-              <TreeView.ItemTemplate>
-                  <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
-                      <TextBlock Text="{Binding Name}"/>
-                  </HierarchicalDataTemplate>
-              </TreeView.ItemTemplate>
-          </TreeView>
+        <WrapPanel Margin="16">
+            <TreeView Width="200" Margin="16" ItemsSource="{Binding DataList}">
+                <TreeView.ItemTemplate>
+                    <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                        <TextBlock Text="{Binding Name}"/>
+                    </HierarchicalDataTemplate>
+                </TreeView.ItemTemplate>
+            </TreeView>
+            <TreeView Width="200" Margin="16" ItemsSource="{Binding DataList}" Style="{StaticResource TreeView.Small}">
+                <TreeView.ItemTemplate>
+                    <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                        <TextBlock Text="{Binding Name}"/>
+                    </HierarchicalDataTemplate>
+                </TreeView.ItemTemplate>
+            </TreeView>
+        </WrapPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
index fdbe11b7..14487c3f 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -36,13 +36,14 @@
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeViewItem">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition MinHeight="{StaticResource DefaultControlHeight}"/>
-                            <RowDefinition/>
+                            <RowDefinition MinHeight="{TemplateBinding MinHeight}"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
                             <DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml
index b30ee91b..431ce041 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml
@@ -1,7 +1,17 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem"/>
 
     <Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView"/>
 
+    <Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
+        <Setter Property="Padding" Value="6,0"/>
+        <Setter Property="MinHeight" Value="24"/>
+    </Style>
+
+    <Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 7d11ec23..84372ccf 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -11653,13 +11653,14 @@
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="Padding" Value="10,0" />
 		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeViewItem">
 					<Grid>
 						<Grid.RowDefinitions>
-							<RowDefinition MinHeight="{StaticResource DefaultControlHeight}" />
-							<RowDefinition />
+							<RowDefinition MinHeight="{TemplateBinding MinHeight}" />
+							<RowDefinition Height="Auto" />
 						</Grid.RowDefinitions>
 						<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
 							<DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
@@ -13420,6 +13421,13 @@
 	<Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
 	<Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
 	<Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
+	<Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
+		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />
+	</Style>
 	<Style BasedOn="{StaticResource WatermarkBaseStyle}" TargetType="hc:Watermark" />
 	<Style BasedOn="{StaticResource AutoCompleteTextBoxBaseStyle}" TargetType="hc:AutoCompleteTextBox" />
 	<ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">