From 2cb2f69a1ab47035080b364445fb09624d71879f Mon Sep 17 00:00:00 2001
From: MohammadHadi Attarieh <mhadi.atttarieh@gmail.com>
Date: Mon, 23 Jun 2025 11:50:11 +0330
Subject: [PATCH 1/4] Implement GridView support for having columns

---
 src/MainDemo.Wpf/Trees.xaml                   | 68 ++++++++++++++++---
 .../Converters/ViewIsGridViewConverter.cs     | 18 +++++
 .../MaterialDesignTheme.TreeListView.xaml     | 47 +++++++------
 src/MaterialDesignThemes.Wpf/TreeListView.cs  |  1 -
 4 files changed, 101 insertions(+), 33 deletions(-)
 create mode 100644 src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs

diff --git a/src/MainDemo.Wpf/Trees.xaml b/src/MainDemo.Wpf/Trees.xaml
index 994415ba0b..164747436b 100644
--- a/src/MainDemo.Wpf/Trees.xaml
+++ b/src/MainDemo.Wpf/Trees.xaml
@@ -6,6 +6,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
+             xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              d:DataContext="{d:DesignInstance domain:TreesViewModel}"
              d:DesignHeight="1080"
              d:DesignWidth="1920"
@@ -18,6 +19,8 @@
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
       </ResourceDictionary.MergedDictionaries>
+      
+      <converters:TreeListViewIndentConverter x:Key="TreeListViewIndentConverter" />
     </ResourceDictionary>
   </UserControl.Resources>
 
@@ -214,9 +217,19 @@
                                      ItemsSource="{Binding TreeItems}"
                                      SelectedItem="{Binding SelectedTreeItem}">
             <materialDesign:TreeListView.Resources>
-              <HierarchicalDataTemplate DataType="{x:Type domain:TestItem}"
-                          ItemsSource="{Binding Items, Mode=OneTime}">
-                <TextBlock Margin="3,2" Text="{Binding Name, Mode=OneTime}" />
+              <HierarchicalDataTemplate DataType="{x:Type domain:TestItem}" ItemsSource="{Binding Items, Mode=OneTime}">
+                <StackPanel Orientation="Horizontal">
+                  <StackPanel.Margin>
+                    <MultiBinding Converter="{StaticResource TreeListViewIndentConverter}">
+                      <Binding Path="LevelIndentSize" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type materialDesign:TreeListView}}" />
+                      <Binding Path="Level" RelativeSource="{RelativeSource AncestorType={x:Type materialDesign:TreeListViewItem}}" />
+                    </MultiBinding>
+                  </StackPanel.Margin>
+
+                  <ToggleButton IsChecked="{Binding RelativeSource={RelativeSource AncestorType=materialDesign:TreeListViewItem, Mode=FindAncestor}, Path=IsExpanded}" Style="{StaticResource MaterialDesignTreeListViewToggleButtonStyle}" />
+
+                  <TextBlock VerticalAlignment="Center" Text="{Binding Name, Mode=OneTime}" />
+                </StackPanel>
               </HierarchicalDataTemplate>
 
               <HierarchicalDataTemplate DataType="{x:Type domain:MovieCategory}"
@@ -231,19 +244,52 @@
               </DataTemplate>
             </materialDesign:TreeListView.Resources>
 
-            <!--
-            Because Data Virtualization is enabled on this tree view by default, if you don't bind the IsExpanded property to something in the bound view model,
-            you can loose the expanded state of items when the TreeListViewItem is recycled.
-
-            For more information:
-            https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/issues/3640#issuecomment-2274086113
-            https://learn.microsoft.com/dotnet/desktop/wpf/advanced/optimizing-performance-controls?view=netframeworkdesktop-4.8&WT.mc_id=DT-MVP-5003472
-            -->
+             <!--
+             Because Data Virtualization is enabled on this tree view by default, if you don't bind the IsExpanded property to something in the bound view model,
+             you can loose the expanded state of items when the TreeListViewItem is recycled.
+   
+             For more information:
+             https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/issues/3640#issuecomment-2274086113
+             https://learn.microsoft.com/dotnet/desktop/wpf/advanced/optimizing-performance-controls?view=netframeworkdesktop-4.8&WT.mc_id=DT-MVP-5003472
+             -->
             <materialDesign:TreeListView.ItemContainerStyle>
               <Style TargetType="materialDesign:TreeListViewItem" BasedOn="{StaticResource {x:Type materialDesign:TreeListViewItem}}">
                 <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
               </Style>
             </materialDesign:TreeListView.ItemContainerStyle>
+
+            <materialDesign:TreeListView.View>
+              <GridView>
+                <GridView.Columns>
+                  <GridViewColumn Width="250" Header="Name">
+                    <GridViewColumn.CellTemplate>
+                      <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                          <StackPanel.Margin>
+                            <MultiBinding Converter="{StaticResource TreeListViewIndentConverter}">
+                              <Binding Path="LevelIndentSize" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type materialDesign:TreeListView}}" />
+                              <Binding Path="Level" RelativeSource="{RelativeSource AncestorType={x:Type materialDesign:TreeListViewItem}}" />
+                            </MultiBinding>
+                          </StackPanel.Margin>
+
+                          <ToggleButton IsChecked="{Binding RelativeSource={RelativeSource AncestorType=materialDesign:TreeListViewItem, Mode=FindAncestor}, Path=IsExpanded}" Style="{StaticResource MaterialDesignTreeListViewToggleButtonStyle}" />
+
+                          <TextBlock VerticalAlignment="Center" Text="{Binding Name, Mode=OneTime}" />
+                        </StackPanel>
+                      </DataTemplate>
+                    </GridViewColumn.CellTemplate>
+                  </GridViewColumn>
+
+                  <GridViewColumn Width="100" Header="Count">
+                    <GridViewColumn.CellTemplate>
+                      <DataTemplate>
+                        <TextBlock VerticalAlignment="Center" Text="{Binding Items.Count, Mode=OneWay}" />
+                      </DataTemplate>
+                    </GridViewColumn.CellTemplate>
+                  </GridViewColumn>
+                </GridView.Columns>
+              </GridView>
+            </materialDesign:TreeListView.View>
           </materialDesign:TreeListView>
           <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right">
             <Button Command="{Binding AddListTreeItemCommand}"
diff --git a/src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs
new file mode 100644
index 0000000000..140c620481
--- /dev/null
+++ b/src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs
@@ -0,0 +1,18 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters;
+
+internal class ViewIsGridViewConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        // Returns true if value is a GridView, otherwise false
+        return value is GridView;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
index 0f13b84415..32aa52c5f7 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
@@ -1,8 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
-                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
-                    xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal">
+                    xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
+                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
+  <converters:ViewIsGridViewConverter x:Key="ViewIsGridViewConverter" />
 
   <Style x:Key="MaterialDesignTreeListViewToggleButtonStyle" TargetType="{x:Type ToggleButton}">
     <Setter Property="Background" Value="Transparent" />
@@ -78,6 +79,11 @@
               </Canvas>
             </Viewbox>
           </Border>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type wpf:TreeListViewItem}}, Path=HasItems}" Value="false">
+              <Setter Property="Visibility" Value="Hidden" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
@@ -105,12 +111,6 @@
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type wpf:TreeListViewItem}">
           <Grid>
-            <Grid.Margin>
-              <MultiBinding Converter="{x:Static converters:TreeListViewIndentConverter.Instance}">
-                <Binding Path="LevelIndentSize" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type wpf:TreeListView}}" FallbackValue="16" />
-                <Binding Path="Level" RelativeSource="{RelativeSource TemplatedParent}" />
-              </MultiBinding>
-            </Grid.Margin>
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="Auto" />
               <ColumnDefinition Width="Auto" />
@@ -164,15 +164,6 @@
                 <VisualState x:Name="Collapsed" />
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <ToggleButton x:Name="Expander"
-                          Width="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
-                          Height="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
-                          Margin="8,0,8,0"
-                          VerticalAlignment="Center"
-                          ClickMode="Press"
-                          Foreground="{TemplateBinding Foreground}"
-                          IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource MaterialDesignTreeListViewToggleButtonStyle}" />
 
             <Border x:Name="MouseOverBorder"
                     Grid.Column="1"
@@ -198,8 +189,19 @@
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Feedback="{TemplateBinding Foreground, Converter={x:Static converters:BrushRoundConverter.Instance}}"
                           Focusable="False"
+                          Foreground="{TemplateBinding Foreground}"
                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <internal:TreeListViewContentPresenter x:Name="PART_ContentPresenter" ContentSource="Content" />
+                <Grid Margin="0,0,0,0">
+                  <internal:TreeListViewContentPresenter x:Name="PART_ContentPresenter"
+                                                         ContentSource="Content"
+                                                         Visibility="Visible" />
+
+                  <GridViewRowPresenter x:Name="PART_GridViewRowPresenterr"
+                                        Margin="{TemplateBinding Padding}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                        Visibility="Collapsed" />
+                </Grid>
               </wpf:Ripple>
             </Grid>
 
@@ -219,9 +221,6 @@
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplateSelector), Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}, Mode=OneWay}" Value="Visible">
               <Setter TargetName="AdditionalContentControl" Property="Visibility" Value="Visible" />
             </DataTrigger>
-            <Trigger Property="HasItems" Value="false">
-              <Setter TargetName="Expander" Property="Visibility" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TreeViewAssist.HasNoItemsExpanderVisibility)}" />
-            </Trigger>
             <Trigger Property="IsEnabled" Value="false">
               <Setter Property="Opacity" Value=".56" />
             </Trigger>
@@ -230,6 +229,10 @@
               <Setter TargetName="Ripple" Property="Feedback" Value="Transparent" />
               <Setter TargetName="SelectedBorder" Property="Visibility" Value="Collapsed" />
             </DataTrigger>
+            <DataTrigger Binding="{Binding View, RelativeSource={RelativeSource Self}, Converter={StaticResource ViewIsGridViewConverter}}" Value="True">
+              <Setter TargetName="PART_ContentPresenter" Property="Visibility" Value="Hidden" />
+              <Setter TargetName="PART_GridViewRowPresenterr" Property="Visibility" Value="Visible" />
+            </DataTrigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
@@ -245,6 +248,7 @@
     <Setter Property="BorderBrush" Value="{x:Null}" />
     <Setter Property="BorderThickness" Value="0" />
     <Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Foreground}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Padding" Value="1" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
     <Setter Property="ScrollViewer.PanningMode" Value="Both" />
@@ -257,6 +261,7 @@
                   BorderThickness="{TemplateBinding BorderThickness}"
                   SnapsToDevicePixels="true">
             <ScrollViewer x:Name="PART_ScrollViewer"
+                          Style="{DynamicResource {x:Static GridView.GridViewScrollViewerStyleKey}}"
                           wpf:ScrollViewerAssist.IgnorePadding="{Binding Path=(wpf:ScrollViewerAssist.IgnorePadding), RelativeSource={RelativeSource TemplatedParent}}"
                           wpf:ScrollViewerAssist.PaddingMode="{Binding Path=(wpf:ScrollViewerAssist.PaddingMode), RelativeSource={RelativeSource TemplatedParent}}"
                           Padding="{TemplateBinding Padding}"
diff --git a/src/MaterialDesignThemes.Wpf/TreeListView.cs b/src/MaterialDesignThemes.Wpf/TreeListView.cs
index e5c778773c..201590032c 100644
--- a/src/MaterialDesignThemes.Wpf/TreeListView.cs
+++ b/src/MaterialDesignThemes.Wpf/TreeListView.cs
@@ -6,7 +6,6 @@
 namespace MaterialDesignThemes.Wpf;
 
 //TODO: Implement bindable property for getting selected items
-//TODO: Implement GridView support for having columns
 public class TreeListView : ListView
 {
     public double LevelIndentSize

From f18c1ec9ed2e81d560b5eb7751e74040a29cfed6 Mon Sep 17 00:00:00 2001
From: MohammadHadi Attarieh <mhadi.attarieh@gmail.com>
Date: Fri, 27 Jun 2025 15:25:28 +0330
Subject: [PATCH 2/4] clean up

---
 .../Converters/{ => Internal}/ViewIsGridViewConverter.cs    | 2 +-
 .../Themes/MaterialDesignTheme.TreeListView.xaml            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename src/MaterialDesignThemes.Wpf/Converters/{ => Internal}/ViewIsGridViewConverter.cs (89%)

diff --git a/src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/Internal/ViewIsGridViewConverter.cs
similarity index 89%
rename from src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs
rename to src/MaterialDesignThemes.Wpf/Converters/Internal/ViewIsGridViewConverter.cs
index 140c620481..2a9968efc1 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/Internal/ViewIsGridViewConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace MaterialDesignThemes.Wpf.Converters;
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
 
 internal class ViewIsGridViewConverter : IValueConverter
 {
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
index 32aa52c5f7..60f9e2e270 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
@@ -1,12 +1,14 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+                    xmlns:internalConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal"
                     xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
-  <converters:ViewIsGridViewConverter x:Key="ViewIsGridViewConverter" />
+  <internalConverters:ViewIsGridViewConverter x:Key="ViewIsGridViewConverter" />
 
   <Style x:Key="MaterialDesignTreeListViewToggleButtonStyle" TargetType="{x:Type ToggleButton}">
     <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=wpf:TreeListViewItem}}" />
     <Setter Property="Focusable" Value="False" />
     <Setter Property="Height" Value="16" />
     <Setter Property="Template">
@@ -229,7 +231,7 @@
               <Setter TargetName="Ripple" Property="Feedback" Value="Transparent" />
               <Setter TargetName="SelectedBorder" Property="Visibility" Value="Collapsed" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding View, RelativeSource={RelativeSource Self}, Converter={StaticResource ViewIsGridViewConverter}}" Value="True">
+            <DataTrigger Binding="{Binding View, RelativeSource={RelativeSource AncestorType=wpf:TreeListView}, Converter={StaticResource ViewIsGridViewConverter}}" Value="True">
               <Setter TargetName="PART_ContentPresenter" Property="Visibility" Value="Hidden" />
               <Setter TargetName="PART_GridViewRowPresenterr" Property="Visibility" Value="Visible" />
             </DataTrigger>

From a17bf56b2b0fc455991d44452ce8543db321683d Mon Sep 17 00:00:00 2001
From: MohammadHadi Attarieh <mhadi.attarieh@gmail.com>
Date: Sat, 5 Jul 2025 02:58:34 +0330
Subject: [PATCH 3/4] automatically add toggle button to first column

---
 src/MainDemo.Wpf/Trees.xaml                   | 31 +--------
 .../MaterialDesignTheme.TreeListView.xaml     | 23 ++++++-
 src/MaterialDesignThemes.Wpf/TreeListView.cs  | 68 +++++++++++++++++++
 3 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/src/MainDemo.Wpf/Trees.xaml b/src/MainDemo.Wpf/Trees.xaml
index 164747436b..a3321b5904 100644
--- a/src/MainDemo.Wpf/Trees.xaml
+++ b/src/MainDemo.Wpf/Trees.xaml
@@ -6,7 +6,6 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
-             xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              d:DataContext="{d:DesignInstance domain:TreesViewModel}"
              d:DesignHeight="1080"
              d:DesignWidth="1920"
@@ -19,8 +18,6 @@
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
       </ResourceDictionary.MergedDictionaries>
-      
-      <converters:TreeListViewIndentConverter x:Key="TreeListViewIndentConverter" />
     </ResourceDictionary>
   </UserControl.Resources>
 
@@ -218,18 +215,7 @@
                                      SelectedItem="{Binding SelectedTreeItem}">
             <materialDesign:TreeListView.Resources>
               <HierarchicalDataTemplate DataType="{x:Type domain:TestItem}" ItemsSource="{Binding Items, Mode=OneTime}">
-                <StackPanel Orientation="Horizontal">
-                  <StackPanel.Margin>
-                    <MultiBinding Converter="{StaticResource TreeListViewIndentConverter}">
-                      <Binding Path="LevelIndentSize" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type materialDesign:TreeListView}}" />
-                      <Binding Path="Level" RelativeSource="{RelativeSource AncestorType={x:Type materialDesign:TreeListViewItem}}" />
-                    </MultiBinding>
-                  </StackPanel.Margin>
-
-                  <ToggleButton IsChecked="{Binding RelativeSource={RelativeSource AncestorType=materialDesign:TreeListViewItem, Mode=FindAncestor}, Path=IsExpanded}" Style="{StaticResource MaterialDesignTreeListViewToggleButtonStyle}" />
-
                   <TextBlock VerticalAlignment="Center" Text="{Binding Name, Mode=OneTime}" />
-                </StackPanel>
               </HierarchicalDataTemplate>
 
               <HierarchicalDataTemplate DataType="{x:Type domain:MovieCategory}"
@@ -258,24 +244,13 @@
               </Style>
             </materialDesign:TreeListView.ItemContainerStyle>
 
-            <materialDesign:TreeListView.View>
+            <!--<materialDesign:TreeListView.View>
               <GridView>
                 <GridView.Columns>
                   <GridViewColumn Width="250" Header="Name">
                     <GridViewColumn.CellTemplate>
                       <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                          <StackPanel.Margin>
-                            <MultiBinding Converter="{StaticResource TreeListViewIndentConverter}">
-                              <Binding Path="LevelIndentSize" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type materialDesign:TreeListView}}" />
-                              <Binding Path="Level" RelativeSource="{RelativeSource AncestorType={x:Type materialDesign:TreeListViewItem}}" />
-                            </MultiBinding>
-                          </StackPanel.Margin>
-
-                          <ToggleButton IsChecked="{Binding RelativeSource={RelativeSource AncestorType=materialDesign:TreeListViewItem, Mode=FindAncestor}, Path=IsExpanded}" Style="{StaticResource MaterialDesignTreeListViewToggleButtonStyle}" />
-
-                          <TextBlock VerticalAlignment="Center" Text="{Binding Name, Mode=OneTime}" />
-                        </StackPanel>
+                        <TextBlock VerticalAlignment="Center" Text="{Binding Name, Mode=OneTime}" />
                       </DataTemplate>
                     </GridViewColumn.CellTemplate>
                   </GridViewColumn>
@@ -289,7 +264,7 @@
                   </GridViewColumn>
                 </GridView.Columns>
               </GridView>
-            </materialDesign:TreeListView.View>
+            </materialDesign:TreeListView.View>-->
           </materialDesign:TreeListView>
           <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right">
             <Button Command="{Binding AddListTreeItemCommand}"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
index 60f9e2e270..e4aefe4d25 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
@@ -112,7 +112,16 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type wpf:TreeListViewItem}">
-          <Grid>
+          <Grid x:Name="ItemGrid">
+            <Grid.Margin>
+              <MultiBinding Converter="{x:Static converters:TreeListViewIndentConverter.Instance}">
+                <Binding Path="LevelIndentSize"
+                         RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type wpf:TreeListView}}"
+                         FallbackValue="16" />
+                <Binding Path="Level"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+              </MultiBinding>
+            </Grid.Margin>
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="Auto" />
               <ColumnDefinition Width="Auto" />
@@ -166,7 +175,15 @@
                 <VisualState x:Name="Collapsed" />
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-
+            <ToggleButton x:Name="Expander"
+                          Width="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
+                          Height="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
+                          Margin="8,0,8,0"
+                          VerticalAlignment="Center"
+                          ClickMode="Press"
+                          Foreground="{TemplateBinding Foreground}"
+                          IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                          Style="{StaticResource MaterialDesignTreeListViewToggleButtonStyle}" />
             <Border x:Name="MouseOverBorder"
                     Grid.Column="1"
                     Grid.ColumnSpan="2"
@@ -234,6 +251,8 @@
             <DataTrigger Binding="{Binding View, RelativeSource={RelativeSource AncestorType=wpf:TreeListView}, Converter={StaticResource ViewIsGridViewConverter}}" Value="True">
               <Setter TargetName="PART_ContentPresenter" Property="Visibility" Value="Hidden" />
               <Setter TargetName="PART_GridViewRowPresenterr" Property="Visibility" Value="Visible" />
+              <Setter TargetName="Expander" Property="Visibility" Value="Collapsed" />
+              <Setter TargetName="ItemGrid" Property="Margin" Value="0" />
             </DataTrigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
diff --git a/src/MaterialDesignThemes.Wpf/TreeListView.cs b/src/MaterialDesignThemes.Wpf/TreeListView.cs
index 201590032c..48168e8f32 100644
--- a/src/MaterialDesignThemes.Wpf/TreeListView.cs
+++ b/src/MaterialDesignThemes.Wpf/TreeListView.cs
@@ -1,6 +1,10 @@
+using System.Collections;
 using System.Collections.Specialized;
 using System.Windows.Automation.Peers;
+using System.Windows.Data;
+
 using MaterialDesignThemes.Wpf.Automation.Peers;
+using MaterialDesignThemes.Wpf.Converters;
 using MaterialDesignThemes.Wpf.Internal;
 
 namespace MaterialDesignThemes.Wpf;
@@ -258,4 +262,68 @@ internal void MoveSelectionToParent(TreeListViewItem item)
             }
         }
     }
+
+    protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        base.OnPropertyChanged(e);
+
+        if (e.Property == ViewProperty)
+        {
+            if (View is GridView gridView)
+            {
+                AddToggleButtonToFirstColumn(gridView);
+            }
+        }
+    }
+
+    private void AddToggleButtonToFirstColumn(GridView gridView)
+    {
+        if (gridView.Columns.Count > 0)
+        {
+            var firstColumn = gridView.Columns[0];
+            firstColumn.CellTemplate = CreateToggleButtonTemplate(firstColumn.CellTemplate);
+        }
+    }
+
+    private DataTemplate CreateToggleButtonTemplate(DataTemplate originalTemplate)
+    {
+        var template = new DataTemplate();
+
+        var stackPanelFactory = new FrameworkElementFactory(typeof(StackPanel));
+        stackPanelFactory.SetValue(StackPanel.OrientationProperty, Orientation.Horizontal);
+
+        var marginMultiBinding = new MultiBinding
+        {
+            Converter = TreeListViewIndentConverter.Instance,
+        };
+        marginMultiBinding.Bindings.Add(new Binding("LevelIndentSize")
+        {
+            RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(TreeListView), 1)
+        });
+        marginMultiBinding.Bindings.Add(new Binding("Level")
+        {
+            RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(TreeListViewItem), 1)
+        });
+        stackPanelFactory.SetBinding(StackPanel.MarginProperty, marginMultiBinding);
+
+        var toggleButtonFactory = new FrameworkElementFactory(typeof(ToggleButton));
+        toggleButtonFactory.SetValue(ToggleButton.StyleProperty, Application.Current.Resources["MaterialDesignTreeListViewToggleButtonStyle"]);
+
+        toggleButtonFactory.SetBinding(ToggleButton.IsCheckedProperty, new Binding("IsExpanded")
+        {
+            RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(TreeListViewItem), 1)
+        });
+
+        stackPanelFactory.AppendChild(toggleButtonFactory);
+
+        if (originalTemplate != null)
+        {
+            var originalContentFactory = new FrameworkElementFactory(typeof(ContentPresenter));
+            originalContentFactory.SetValue(ContentPresenter.ContentTemplateProperty, originalTemplate);
+            stackPanelFactory.AppendChild(originalContentFactory);
+        }
+
+        template.VisualTree = stackPanelFactory;
+        return template;
+    }
 }

From 345487f43d62b601af71f1170b53b4de660b5e21 Mon Sep 17 00:00:00 2001
From: MohammadHadi Attarieh <mhadi.attarieh@gmail.com>
Date: Sat, 5 Jul 2025 03:15:41 +0330
Subject: [PATCH 4/4] clean up

---
 src/MaterialDesignThemes.Wpf/TreeListView.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/TreeListView.cs b/src/MaterialDesignThemes.Wpf/TreeListView.cs
index 48168e8f32..3e1176126a 100644
--- a/src/MaterialDesignThemes.Wpf/TreeListView.cs
+++ b/src/MaterialDesignThemes.Wpf/TreeListView.cs
@@ -296,11 +296,11 @@ private DataTemplate CreateToggleButtonTemplate(DataTemplate originalTemplate)
         {
             Converter = TreeListViewIndentConverter.Instance,
         };
-        marginMultiBinding.Bindings.Add(new Binding("LevelIndentSize")
+        marginMultiBinding.Bindings.Add(new Binding(LevelIndentSizeProperty.Name)
         {
             RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(TreeListView), 1)
         });
-        marginMultiBinding.Bindings.Add(new Binding("Level")
+        marginMultiBinding.Bindings.Add(new Binding(TreeListViewItem.LevelProperty.Name)
         {
             RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(TreeListViewItem), 1)
         });
@@ -309,7 +309,7 @@ private DataTemplate CreateToggleButtonTemplate(DataTemplate originalTemplate)
         var toggleButtonFactory = new FrameworkElementFactory(typeof(ToggleButton));
         toggleButtonFactory.SetValue(ToggleButton.StyleProperty, Application.Current.Resources["MaterialDesignTreeListViewToggleButtonStyle"]);
 
-        toggleButtonFactory.SetBinding(ToggleButton.IsCheckedProperty, new Binding("IsExpanded")
+        toggleButtonFactory.SetBinding(ToggleButton.IsCheckedProperty, new Binding(TreeListViewItem.IsExpandedProperty.Name)
         {
             RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(TreeListViewItem), 1)
         });