From 0bd65eb75738f6bbf62572a34d5d999b76f331c9 Mon Sep 17 00:00:00 2001
From: koal <random.var.ny@gmail.com>
Date: Wed, 20 Sep 2023 20:18:32 -0700
Subject: [PATCH] Remove ContentAlignment bindings from TreeViewItem

Binding to ancestor ControlItem (TreeView), could, under certain conditions, incur binding errors during template switching as visual elements are torn down with TreeView destroyed before item bindings have been released.

This fix opts for a more standard and safer styling approach for TreeViewItem that doesn't require binding to an ancestor.
---
 src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml b/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml
index 2cd897966..9ea0288d7 100644
--- a/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml
+++ b/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml
@@ -84,8 +84,6 @@
                 <SolidColorBrush Opacity="0.0" Color="{DynamicResource ControlFillColorDefault}" />
             </Setter.Value>
         </Setter>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="FontSize" Value="{StaticResource TreeViewItemFontSize}" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -211,8 +209,6 @@
                 <SolidColorBrush Opacity="0.0" Color="{DynamicResource ControlFillColorDefault}" />
             </Setter.Value>
         </Setter>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource TreeViewItemFocusVisual}" />
         <Setter Property="OverridesDefaultStyle" Value="True" />