Merge from main

Author: Magnus Torsgården

samples/WinUI.TableView.SampleApp/MainPage.xaml.cs

@@ -115,6 +115,7 @@ private void OnNavigationSelectionChanged(NavigationView sender, NavigationViewS
                 "Data Export" => typeof(ExportPage),
                 "Large Dataset" => typeof(LargeDataPage),
                 "Conditional Cell Styling" => typeof(ConditionalStylingPage),
+                "Column Sizing" => typeof(ColumnSizingPage),
                 _ => typeof(BlankPage)
             };
 

samples/WinUI.TableView.SampleApp/Pages/ColumnSizingPage.xaml

@@ -0,0 +1,43 @@
+<Page x:Class="WinUI.TableView.SampleApp.Pages.ColumnSizingPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:WinUI.TableView.SampleApp.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:WinUI.TableView.SampleApp"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:tv="using:WinUI.TableView"
+      xmlns:ui="using:CommunityToolkit.WinUI"
+      d:DataContext="{d:DesignInstance Type=local:ExampleViewModel}"
+      mc:Ignorable="d"
+      DataContextChanged="OnDataContextChanged">
+
+    <Grid>
+        <controls:SamplePresenter Description="This sample demonstrates the different ways a column can be sized." 
+                                  Header="Column Sizing">
+            <controls:SamplePresenter.Example>
+                <tv:TableView x:Name="tableView"
+                              ItemsSource="{Binding Items}" />
+            </controls:SamplePresenter.Example>
+            <controls:SamplePresenter.Options>
+                <StackPanel Spacing="16"
+                            MinWidth="200">
+                    <ComboBox x:Name="columnAutoWidthMode"
+                              HorizontalAlignment="Stretch"
+                              Header="Column Auto Width Mode"
+                              SelectedItem="{Binding ColumnAutoWidthMode, Mode=TwoWay, ElementName=tableView}"
+                              ItemsSource="{ui:EnumValues Type=tv:TableViewColumnAutoWidthMode}" />
+                </StackPanel>
+            </controls:SamplePresenter.Options>
+            <controls:SamplePresenter.Xaml>
+                <x:String xml:space="preserve">
+&lt;tv:TableView ItemsSource="{Binding Items}"
+    ColumnAutoWidthMode="$(ColumnAutoWidthMode)"/>
+                </x:String>
+            </controls:SamplePresenter.Xaml>
+            <controls:SamplePresenter.Substitutions>
+                <controls:CodeSubstitution Key="ColumnAutoWidthMode"
+                                           Value="{x:Bind columnAutoWidthMode.SelectedItem, Mode=OneWay}" />
+            </controls:SamplePresenter.Substitutions>
+        </controls:SamplePresenter>
+    </Grid>
+</Page>

samples/WinUI.TableView.SampleApp/Pages/ColumnSizingPage.xaml.cs

@@ -0,0 +1,20 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace WinUI.TableView.SampleApp.Pages;
+
+public sealed partial class ColumnSizingPage : Page
+{
+    public ColumnSizingPage()
+    {
+        InitializeComponent();
+
+    }
+
+    private void OnDataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
+    {
+        if (DataContext is not ExampleViewModel viewModel) return;
+
+        viewModel.Items = [.. ExampleViewModel.ItemsList.Take(20)];
+    }
+}

src/Columns/TableViewColumn.cs

@@ -237,6 +237,15 @@ public double ActualWidth
         set => SetValue(ActualWidthProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets the ColumnAutoWidthMode of the column.
+    /// </summary>
+    public TableViewColumnAutoWidthMode? ColumnAutoWidthMode
+    {
+        get => (TableViewColumnAutoWidthMode?)GetValue(ColumnAutoWidthModeProperty);
+        set => SetValue(ColumnAutoWidthModeProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets a value indicating whether the column can be resized.
     /// </summary>
@@ -506,6 +515,17 @@ private static void OnPropertyChanged(DependencyObject d, DependencyPropertyChan
         }
     }
 
+    /// <summary>
+    /// Handles changes to the ColumnAutoWidthMode property.
+    /// </summary>
+    private static void OnColumnAutoWidthModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is TableViewColumn column)
+        {
+            column.TableView?.RefreshColumnsAutoWidth([column]);
+        }
+    }
+
     /// <summary>
     /// Handles changes to the IsReadOnly property.
     /// </summary>
@@ -598,6 +618,11 @@ public string? SortMemberPath
     /// </summary>
     public static readonly DependencyProperty ActualWidthProperty = DependencyProperty.Register(nameof(ActualWidth), typeof(double), typeof(TableViewColumn), new PropertyMetadata(0d, OnPropertyChanged));
 
+    /// <summary>
+    /// Identifies the ColumnAutoWidthMode dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ColumnAutoWidthModeProperty = DependencyProperty.Register(nameof(ColumnAutoWidthMode), typeof(TableViewColumnAutoWidthMode?), typeof(TableViewColumn), new PropertyMetadata(null, OnColumnAutoWidthModeChanged));
+
     /// <summary>
     /// Identifies the CanResize dependency property.
     /// </summary>