From b5d831a4bff74323ea7451425ab89a7a4cb7f1c7 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Briede <jebriede@microsoft.com>
Date: Thu, 14 Jan 2021 19:23:54 -0800
Subject: [PATCH] Fixed the Dependencies tree's root nodes' style so the roots
 appear correctly when selected in all themes. Also fixed the border color of
 the Dependencies TreeView control for all themes.

---
 .../Xamls/PackageMetadataControl.xaml         | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageMetadataControl.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageMetadataControl.xaml
index de6443647e0..3f92726535e 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageMetadataControl.xaml
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageMetadataControl.xaml
@@ -309,7 +309,8 @@
         Background="{x:Null}"
         TreeViewItem.Selected="OnItemSelected"
         LostFocus="TreeView_LostFocus"
-        AutomationProperties.Name="{x:Static nuget:Resources.Label_Dependencies}">
+        AutomationProperties.Name="{x:Static nuget:Resources.Label_Dependencies}"
+        FocusVisualStyle="{StaticResource ControlsFocusVisualStyle}">
       <TreeView.Template>
         <!--
           Replaces default control template for this treeview with a slimmer control template.
@@ -329,17 +330,22 @@
           <TextBlock Text="{Binding}" ToolTip="{Binding}" />
         </DataTemplate>
       </TreeView.Resources>
+      <TreeView.ItemContainerStyle>
+        <Style TargetType="TreeViewItem">
+          <Setter Property="IsExpanded" Value="True" />
+          <Setter Property="AutomationProperties.Name" Value="{Binding RelativeSource={RelativeSource Self},Converter={StaticResource AccNameWorkaround}}" />
+          <Setter Property="Foreground" Value="{DynamicResource {x:Static nuget:Brushes.UIText}}" />
+          <Setter Property="FontWeight" Value="Bold" />
+        </Style>
+      </TreeView.ItemContainerStyle>
       <TreeViewItem Header="{x:Static nuget:Resources.Label_Dependencies}"
-                    ItemsSource="{Binding Path=DependencySets}"
-                    IsExpanded="true"
-                    Foreground="{DynamicResource {x:Static nuget:Brushes.UIText}}"
-                    FontWeight="Bold">
+                    ItemsSource="{Binding Path=DependencySets}">
         <TreeViewItem.ItemContainerStyle>
           <Style TargetType="TreeViewItem">
-            <Setter Property="IsExpanded" Value="true" />
+            <Setter Property="IsExpanded" Value="True" />
             <Setter Property="AutomationProperties.Name" Value="{Binding RelativeSource={RelativeSource Self},Converter={StaticResource AccNameWorkaround}}" />
             <Setter Property="Foreground" Value="{DynamicResource {x:Static nuget:Brushes.UIText}}" />
-            <Setter Property="FontWeight" Value="normal" />
+            <Setter Property="FontWeight" Value="Normal" />
           </Style>
         </TreeViewItem.ItemContainerStyle>
       </TreeViewItem>