From b7e08aec23017a13c34f7e72f4c8f75008be26bd Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 3 Aug 2021 22:28:37 +0800
Subject: [PATCH] modified datagrid style

RowHeight, ColumnHeaderHeight, ShowSelectAllButton
---
 .../Themes/Styles/DataGrid.xaml               | 22 +++++--
 .../HandyControl_Net_40/Themes/Theme.xaml     | 16 +++--
 .../Controls/Attach/DataGridAttach.cs         |  9 +++
 .../HandyControl_Shared.projitems             |  1 +
 .../Themes/Basic/Converters.xaml              |  3 +-
 .../Themes/Styles/DataGrid.xaml               | 22 +++++--
 .../HandyControl_Shared/Themes/Theme.xaml     | 16 +++--
 ...aGridSelectAllButtonVisibilityConverter.cs | 60 +++++++++++++++++++
 8 files changed, 132 insertions(+), 17 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
index 1cc5e37d..dd7bb5f0 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -92,13 +92,13 @@
             </MultiTrigger>
         </Style.Triggers>
     </Style>
+
     <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="SnapsToDevicePixels" Value="true"/>
         <Setter Property="Margin" Value="0,0,0,4"/>
         <Setter Property="Padding" Value="0,6"/>
-        <Setter Property="MinHeight" Value="44"/>
         <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
         <Setter Property="ValidationErrorTemplate">
             <Setter.Value>
@@ -145,6 +145,7 @@
             </MultiTrigger>
         </Style.Triggers>
     </Style>
+
     <Style x:Key="ColumnHeaderGripperStyle" TargetType="Thumb">
         <Setter Property="Width" Value="8"/>
         <Setter Property="Background" Value="Transparent"/>
@@ -157,11 +158,11 @@
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Padding" Value="12,6,12,12"/>
-        <Setter Property="MinHeight" Value="44"/>
+        <Setter Property="Padding" Value="12,0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridColumnHeader">
@@ -203,6 +204,7 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
     <Style x:Key="DataGridRowHeaderStyle" TargetType="DataGridRowHeader">
         <Setter Property="Template">
             <Setter.Value>
@@ -220,6 +222,7 @@
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style x:Key="TextBlockComboBoxStyle" TargetType="ComboBox">
         <Setter Property="Focusable" Value="True"/>
         <Setter Property="Template">
@@ -230,9 +233,11 @@
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style x:Key="DataGridTextColumnStyle" TargetType="TextBlock">
         <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
     </Style>
+
     <Style TargetType="DataGrid">
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
@@ -253,6 +258,8 @@
         <Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}"/>
         <Setter Property="Padding" Value="6"/>
         <Setter Property="ColumnWidth" Value="*"/>
+        <Setter Property="RowHeight" Value="44"/>
+        <Setter Property="ColumnHeaderHeight" Value="44"/>
         <Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}"/>
         <Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}"/>
         <Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}"/>
@@ -295,7 +302,14 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
+                                            <Button.Visibility>
+                                                <MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
+                                                    <Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}"/>
+                                                    <Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}"/>
+                                                </MultiBinding>
+                                            </Button.Visibility>
+                                        </Button>
                                         <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                                         <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
                                             <hc:ToggleBlock.CheckedContent>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index ba899d5a..ab59c83a 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -31,6 +31,7 @@
 	<converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter" />
 	<converter:DoubleMinConverter x:Key="DoubleMinConverter" />
 	<converter:Object2StringConverter x:Key="Object2StringConverter" />
+	<converter:DataGridSelectAllButtonVisibilityConverter x:Key="DataGridSelectAllButtonVisibilityConverter" />
 	<Color x:Key="EffectShadowColor">#88000000</Color>
 	<system:Double x:Key="LargeFontSize">24</system:Double>
 	<system:Double x:Key="HeadFontSize">20</system:Double>
@@ -11626,7 +11627,6 @@
 		<Setter Property="SnapsToDevicePixels" Value="true" />
 		<Setter Property="Margin" Value="0,0,0,4" />
 		<Setter Property="Padding" Value="0,6" />
-		<Setter Property="MinHeight" Value="44" />
 		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="ValidationErrorTemplate">
 			<Setter.Value>
@@ -11676,8 +11676,7 @@
 	<Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Padding" Value="12,6,12,12" />
-		<Setter Property="MinHeight" Value="44" />
+		<Setter Property="Padding" Value="12,0" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="DataGridColumnHeader">
@@ -11756,6 +11755,8 @@
 		<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}" />
 		<Setter Property="Padding" Value="6" />
 		<Setter Property="ColumnWidth" Value="*" />
+		<Setter Property="RowHeight" Value="44" />
+		<Setter Property="ColumnHeaderHeight" Value="44" />
 		<Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}" />
 		<Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}" />
 		<Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}" />
@@ -11798,7 +11799,14 @@
 											<RowDefinition Height="Auto" />
 											<RowDefinition Height="*" />
 										</Grid.RowDefinitions>
-										<Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}" />
+										<Button Command="{x:Static DataGrid.SelectAllCommand}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
+											<Button.Visibility>
+												<MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
+													<Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+													<Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+												</MultiBinding>
+											</Button.Visibility>
+										</Button>
 										<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
 										<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 											<hc:ToggleBlock.CheckedContent>
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
index 2feb13e7..64eb1888 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
@@ -336,5 +336,14 @@ namespace HandyControl.Controls
 
         public static bool GetCanUnselectAllWithBlankArea(DependencyObject element)
             => (bool) element.GetValue(CanUnselectAllWithBlankAreaProperty);
+
+        public static readonly DependencyProperty ShowSelectAllButtonProperty = DependencyProperty.RegisterAttached(
+            "ShowSelectAllButton", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.TrueBox));
+
+        public static void SetShowSelectAllButton(DependencyObject element, bool value)
+            => element.SetValue(ShowSelectAllButtonProperty, value);
+
+        public static bool GetShowSelectAllButton(DependencyObject element)
+            => (bool) element.GetValue(ShowSelectAllButtonProperty);
     }
 }
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 32dd5561..7032cb29 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -136,6 +136,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\BorderCircularClipConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\ColLayoutConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\CornerRadiusSplitConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\DataGridSelectAllButtonVisibilityConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Double2GridLengthConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\DoubleMinConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Number2PercentageConverter.cs" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
index 97863a55..9657a184 100644
--- a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
@@ -27,4 +27,5 @@
     <converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter"/>
     <converter:DoubleMinConverter x:Key="DoubleMinConverter"/>
     <converter:Object2StringConverter x:Key="Object2StringConverter"/>
-</ResourceDictionary>
\ No newline at end of file
+    <converter:DataGridSelectAllButtonVisibilityConverter x:Key="DataGridSelectAllButtonVisibilityConverter"/>
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
index 347861e8..4d435fe4 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
@@ -91,13 +91,13 @@
             </MultiTrigger>
         </Style.Triggers>
     </Style>
+
     <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="SnapsToDevicePixels" Value="true"/>
         <Setter Property="Margin" Value="0,0,0,4"/>
         <Setter Property="Padding" Value="0,6"/>
-        <Setter Property="MinHeight" Value="44"/>
         <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
         <Setter Property="ValidationErrorTemplate">
             <Setter.Value>
@@ -144,6 +144,7 @@
             </MultiTrigger>
         </Style.Triggers>
     </Style>
+
     <Style x:Key="ColumnHeaderGripperStyle" TargetType="Thumb">
         <Setter Property="Width" Value="8"/>
         <Setter Property="Background" Value="Transparent"/>
@@ -156,11 +157,11 @@
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Padding" Value="12,6,12,12"/>
-        <Setter Property="MinHeight" Value="44"/>
+        <Setter Property="Padding" Value="12,0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridColumnHeader">
@@ -202,6 +203,7 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
     <Style x:Key="DataGridRowHeaderStyle" TargetType="DataGridRowHeader">
         <Setter Property="Template">
             <Setter.Value>
@@ -219,6 +221,7 @@
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style x:Key="TextBlockComboBoxStyle" TargetType="ComboBox">
         <Setter Property="Focusable" Value="True"/>
         <Setter Property="Template">
@@ -229,9 +232,11 @@
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style x:Key="DataGridTextColumnStyle" TargetType="TextBlock">
         <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
     </Style>
+
     <Style TargetType="DataGrid">
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
@@ -252,6 +257,8 @@
         <Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}"/>
         <Setter Property="Padding" Value="6"/>
         <Setter Property="ColumnWidth" Value="*"/>
+        <Setter Property="RowHeight" Value="44"/>
+        <Setter Property="ColumnHeaderHeight" Value="44"/>
         <Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}"/>
         <Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}"/>
         <Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}"/>
@@ -294,7 +301,14 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
+                                            <Button.Visibility>
+                                                <MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
+                                                    <Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}"/>
+                                                    <Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}"/>
+                                                </MultiBinding>
+                                            </Button.Visibility>
+                                        </Button>
                                         <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                                         <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
                                             <hc:ToggleBlock.CheckedContent>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 12929faa..957f8d0b 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -31,6 +31,7 @@
 	<converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter" />
 	<converter:DoubleMinConverter x:Key="DoubleMinConverter" />
 	<converter:Object2StringConverter x:Key="Object2StringConverter" />
+	<converter:DataGridSelectAllButtonVisibilityConverter x:Key="DataGridSelectAllButtonVisibilityConverter" />
 	<Color x:Key="EffectShadowColor">#88000000</Color>
 	<system:Double x:Key="LargeFontSize">24</system:Double>
 	<system:Double x:Key="HeadFontSize">20</system:Double>
@@ -11758,7 +11759,6 @@
 		<Setter Property="SnapsToDevicePixels" Value="true" />
 		<Setter Property="Margin" Value="0,0,0,4" />
 		<Setter Property="Padding" Value="0,6" />
-		<Setter Property="MinHeight" Value="44" />
 		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="ValidationErrorTemplate">
 			<Setter.Value>
@@ -11808,8 +11808,7 @@
 	<Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Padding" Value="12,6,12,12" />
-		<Setter Property="MinHeight" Value="44" />
+		<Setter Property="Padding" Value="12,0" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="DataGridColumnHeader">
@@ -11888,6 +11887,8 @@
 		<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}" />
 		<Setter Property="Padding" Value="6" />
 		<Setter Property="ColumnWidth" Value="*" />
+		<Setter Property="RowHeight" Value="44" />
+		<Setter Property="ColumnHeaderHeight" Value="44" />
 		<Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}" />
 		<Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}" />
 		<Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}" />
@@ -11930,7 +11931,14 @@
 											<RowDefinition Height="Auto" />
 											<RowDefinition Height="*" />
 										</Grid.RowDefinitions>
-										<Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}" />
+										<Button Command="{x:Static DataGrid.SelectAllCommand}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
+											<Button.Visibility>
+												<MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
+													<Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+													<Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+												</MultiBinding>
+											</Button.Visibility>
+										</Button>
 										<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
 										<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 											<hc:ToggleBlock.CheckedContent>
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
new file mode 100644
index 00000000..2b0d5b57
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace HandyControl.Tools.Converter
+{
+    public class DataGridSelectAllButtonVisibilityConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null)
+            {
+                return Visibility.Collapsed;
+            }
+
+            if (values.Length != 2)
+            {
+                return Visibility.Collapsed;
+            }
+
+            if (values[0] is DataGridHeadersVisibility headersVisibility)
+            {
+                if (values[1] is bool showButton)
+                {
+                    if (headersVisibility == DataGridHeadersVisibility.All)
+                    {
+                        return showButton ? Visibility.Visible : Visibility.Collapsed;
+                    }
+
+                    return Visibility.Collapsed;
+                }
+
+                return Visibility.Collapsed;
+            }
+            else if (values[0] is bool showButton)
+            {
+                if (values[1] is DataGridHeadersVisibility visibility)
+                {
+                    if (visibility == DataGridHeadersVisibility.All)
+                    {
+                        return showButton ? Visibility.Visible : Visibility.Collapsed;
+                    }
+
+                    return Visibility.Collapsed;
+                }
+
+                return Visibility.Collapsed;
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}