update fonticon

microsoft · May 10, 2021 · 5e89a62 · 5e89a62
1 parent b571377
commit 5e89a62
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/dev/TreeView/TreeViewItem.xaml b/dev/TreeView/TreeViewItem.xaml
@@ -175,26 +175,26 @@
                                 Width="Auto"
                                 Opacity="{TemplateBinding GlyphOpacity}"
                                 Background="Transparent">
-                                <TextBlock Foreground="{TemplateBinding GlyphBrush}"
+                                <FontIcon
+                                    Foreground="{ThemeResource TreeViewItemForeground}"
                                     Width="12"
                                     Height="12"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TreeViewItemTemplateSettings.CollapsedGlyphVisibility}"
-                                    FontSize="{TemplateBinding GlyphSize}"
-                                    Text="{TemplateBinding CollapsedGlyph}"
+                                    FontSize="{ThemeResource TreeViewItemExpandCollapseChevronFontSize}"
+                                    Glyph="{StaticResource TreeViewItemCollapsedGlyph }"
                                     FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                    Padding="2"       
                                     VerticalAlignment="Center"
                                     AutomationProperties.AccessibilityView="Raw"
                                     IsTextScaleFactorEnabled="False"
                                     IsHitTestVisible="False"/>
-                                <TextBlock Foreground="{TemplateBinding GlyphBrush}"
+                                <FontIcon
+                                    Foreground="{ThemeResource TreeViewItemForeground}"
                                     Width="12"
                                     Height="12"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TreeViewItemTemplateSettings.ExpandedGlyphVisibility}" 
-                                    FontSize="{TemplateBinding GlyphSize}"
-                                    Text="{TemplateBinding ExpandedGlyph}"
+                                    FontSize="{ThemeResource TreeViewItemExpandCollapseChevronFontSize}"
+                                    Glyph="{StaticResource TreeViewItemExpandedGlyph }"
                                     FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                    Padding="2"
                                     VerticalAlignment="Center"
                                     AutomationProperties.AccessibilityView="Raw"
                                     IsTextScaleFactorEnabled="False"

diff --git a/dev/TreeView/TreeView_themeresources.xaml b/dev/TreeView/TreeView_themeresources.xaml
@@ -41,6 +41,9 @@
             <x:Double x:Key="TreeViewItemMinHeight">28</x:Double>
             <x:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</x:Double>
             <x:Double x:Key="TreeViewItemContentHeight">20</x:Double>
+            <x:Double x:Key="TreeViewItemExpandCollapseChevronFontSize">8</x:Double>
+            <x:String x:Key="TreeViewItemExpandedGlyph">&#xE70D;</x:String>
+            <x:String x:Key="TreeViewItemCollapsedGlyph">&#xE70E;</x:String>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <StaticResource x:Key="TreeViewItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
@@ -77,6 +80,9 @@
             <x:Double x:Key="TreeViewItemMinHeight">28</x:Double>
             <x:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</x:Double>
             <x:Double x:Key="TreeViewItemContentHeight">20</x:Double>
+            <x:Double x:Key="TreeViewItemExpandCollapseChevronFontSize">8</x:Double>
+            <x:String x:Key="TreeViewItemExpandedGlyph">&#xE70D;</x:String>
+            <x:String x:Key="TreeViewItemCollapsedGlyph">&#xE70E;</x:String>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <StaticResource x:Key="TreeViewItemBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
@@ -113,6 +119,9 @@
             <x:Double x:Key="TreeViewItemMinHeight">28</x:Double>
             <x:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</x:Double>
             <x:Double x:Key="TreeViewItemContentHeight">20</x:Double>
+            <x:Double x:Key="TreeViewItemExpandCollapseChevronFontSize">8</x:Double>
+            <x:String x:Key="TreeViewItemExpandedGlyph">&#xE70D;</x:String>
+            <x:String x:Key="TreeViewItemCollapsedGlyph">&#xE70E;</x:String>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>