fix: Apply proper TreeViewItem indentation

unoplatform · Sep 11, 2020 · a437d2f · a437d2f
1 parent a60a0af
commit a437d2f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TreeView/TreeViewItem.xaml b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TreeView/TreeViewItem.xaml
@@ -7,7 +7,7 @@
     xmlns:local="using:Microsoft.UI.Xaml.Controls"
     xmlns:media="using:Microsoft.UI.Xaml.Media">
     <!--  TODO WinUI: Base on ListViewItemRevealStyle when implemented  -->
-    <Style x:Key="MUX_TreeViewItemStyle" TargetType="local:TreeViewItem">
+	<Style x:Key="MUX_TreeViewItemStyle" TargetType="local:TreeViewItem" BasedOn="{StaticResource ListViewItemExpanded}">
         <Setter Property="Padding" Value="0" />
         <Setter Property="Background" Value="{ThemeResource TreeViewItemBackground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource TreeViewItemBorderBrush}" />

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TreeView/TreeViewList.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TreeView/TreeViewList.cs
@@ -341,6 +341,13 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 			templateSettings.ExpandedGlyphVisibility = itemNode.IsExpanded ? Visibility.Visible : Visibility.Collapsed;
 			templateSettings.CollapsedGlyphVisibility = !itemNode.IsExpanded ? Visibility.Visible : Visibility.Collapsed;
 
+			// Uno Workaround - waiting for #1453, remove this when fixed
+			var treeViewItem = itemContainer;
+			var targetNode = NodeFromContainer(treeViewItem);
+			treeViewItem.UpdateIndentation(targetNode.Depth);
+			treeViewItem.UpdateSelectionVisual(targetNode.SelectionState);
+			// workaround end
+
 			base.PrepareContainerForItemOverride(element, item);
 
 			if (selectionState != itemNode.SelectionState)
@@ -351,7 +358,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
 		protected override DependencyObject GetContainerForItemOverride()
 		{
-			var targetItem = new TreeViewItem();
+			var targetItem = new TreeViewItem() { IsGeneratedContainer = true };
 			return targetItem;
 		}