Merge pull request #184 from w-ahmad/HeaderRowSizing

added HeaderRowMin & Max properties

Author: w-ahmad

src/TableView.Properties.cs

@@ -28,7 +28,17 @@ public partial class TableView
     /// <summary>
     /// Identifies the HeaderRowHeight dependency property.
     /// </summary>
-    public static readonly DependencyProperty HeaderRowHeightProperty = DependencyProperty.Register(nameof(HeaderRowHeight), typeof(double), typeof(TableView), new PropertyMetadata(32d, OnHeaderRowHeightChanged));
+    public static readonly DependencyProperty HeaderRowHeightProperty = DependencyProperty.Register(nameof(HeaderRowHeight), typeof(double), typeof(TableView), new PropertyMetadata(double.NaN, OnHeaderRowHeightChanged));
+
+    /// <summary>
+    /// Identifies the HeaderRowMaxHeight dependency property.
+    /// </summary>
+    public static readonly DependencyProperty HeaderRowMaxHeightProperty = DependencyProperty.Register(nameof(HeaderRowMaxHeight), typeof(double), typeof(TableView), new PropertyMetadata(double.PositiveInfinity, OnHeaderRowHeightChanged));
+
+    /// <summary>
+    /// Identifies the HeaderRowMinHeight dependency property.
+    /// </summary>
+    public static readonly DependencyProperty HeaderRowMinHeightProperty = DependencyProperty.Register(nameof(HeaderRowMinHeight), typeof(double), typeof(TableView), new PropertyMetadata(32d, OnHeaderRowHeightChanged));
 
     /// <summary>
     /// Identifies the RowHeight dependency property.
@@ -252,6 +262,24 @@ public double HeaderRowHeight
         set => SetValue(HeaderRowHeightProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets the max height of the header row.
+    /// </summary>
+    public double HeaderRowMaxHeight
+    {
+        get => (double)GetValue(HeaderRowMaxHeightProperty);
+        set => SetValue(HeaderRowMaxHeightProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the min height of the header row.
+    /// </summary>
+    public double HeaderRowMinHeight
+    {
+        get => (double)GetValue(HeaderRowMinHeightProperty);
+        set => SetValue(HeaderRowMinHeightProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets the height of the rows.
     /// </summary>

src/TableView.cs

@@ -753,7 +753,7 @@ private void UpdateVerticalScrollBarMargin()
             var verticalScrollBar = scrollViewer.FindDescendant<ScrollBar>(x => x.Name == "VerticalScrollBar");
             if (verticalScrollBar is not null)
             {
-                verticalScrollBar.Margin = new Thickness(0, HeaderRowHeight, 0, 0);
+                verticalScrollBar.Margin = new Thickness(0, _headerRow?.ActualHeight ?? 0, 0, 0);
             }
         }
     }

src/TableViewHeaderRow.cs

@@ -230,7 +230,7 @@ internal void CalculateHeaderWidths()
             var autoColumns = allColumns.Where(x => x.Width.IsAuto).ToList();
             var absoluteColumns = allColumns.Where(x => x.Width.IsAbsolute).ToList();
 
-            var height = TableView.HeaderRowHeight;
+            var height = ActualHeight;
             var availableWidth = TableView.ActualWidth - 32;
             var starUnitWeight = starColumns.Select(x => x.Width.Value).Sum();
             var fixedWidth = autoColumns.Select(x =>
@@ -300,7 +300,7 @@ internal void CalculateHeaderWidths()
                     DispatcherQueue.TryEnqueue(() =>
                         header.Measure(
                             new Size(header.Width,
-                            _headersStackPanel?.ActualHeight ?? TableView.HeaderRowHeight)));
+                            _headersStackPanel?.ActualHeight ?? ActualHeight)));
                 }
             }
 

src/Themes/TableView.xaml

@@ -103,6 +103,8 @@
                                     <local:TableViewHeaderRow x:Name="HeaderRow" 
                                                               IsTabStop="False"
                                                               Height="{TemplateBinding HeaderRowHeight}"
+                                                              MaxHeight="{TemplateBinding HeaderRowMaxHeight}"
+                                                              MinHeight="{TemplateBinding HeaderRowMinHeight}"
                                                               TableView="{Binding RelativeSource={RelativeSource TemplatedParent}}">
                                         <interactivity:Interaction.Behaviors>
                                             <behaviors:StickyHeaderBehavior />

src/Themes/TableViewHeaderRow.xaml

@@ -8,8 +8,6 @@
 
     <Style x:Key="DefaultTableViewHeaderRowStyle"
            TargetType="local:TableViewHeaderRow">
-        <Setter Property="Height"
-                Value="32" />
         <Setter Property="Background"
                 Value="{ThemeResource TableViewHeaderRowBackground}" />
         <Setter Property="Template">