From b488e882d448e4d758a609633ba334d4ac539fe7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 24 Nov 2020 14:14:39 +0000
Subject: [PATCH] Add a background to PathIcon.

---
 src/Avalonia.Themes.Default/PathIcon.xaml | 15 +++++++++------
 src/Avalonia.Themes.Fluent/PathIcon.xaml  | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Themes.Default/PathIcon.xaml b/src/Avalonia.Themes.Default/PathIcon.xaml
index a2d01f7b5b..039f0ef10c 100644
--- a/src/Avalonia.Themes.Default/PathIcon.xaml
+++ b/src/Avalonia.Themes.Default/PathIcon.xaml
@@ -2,16 +2,19 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
+    <Setter Property="Background" Value="Transparent" />
     <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
     <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Viewbox Height="{TemplateBinding Height}"
-                 Width="{TemplateBinding Width}">
-          <Path Fill="{TemplateBinding Foreground}"
-                Data="{TemplateBinding Data}"
-                Stretch="Uniform" />
-        </Viewbox>
+      <Border Background="{TemplateBinding Background}">
+          <Viewbox Height="{TemplateBinding Height}"
+                   Width="{TemplateBinding Width}">
+            <Path Fill="{TemplateBinding Foreground}"
+                  Data="{TemplateBinding Data}"
+                  Stretch="Uniform" />
+          </Viewbox>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
diff --git a/src/Avalonia.Themes.Fluent/PathIcon.xaml b/src/Avalonia.Themes.Fluent/PathIcon.xaml
index 0a2c747514..d4952b3571 100644
--- a/src/Avalonia.Themes.Fluent/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/PathIcon.xaml
@@ -10,16 +10,19 @@
   </Design.PreviewWith>
   <Style Selector="PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+    <Setter Property="Background" Value="Transparent" />
     <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
     <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Viewbox Height="{TemplateBinding Height}"
-                 Width="{TemplateBinding Width}">
-          <Path Fill="{TemplateBinding Foreground}"
-                Data="{TemplateBinding Data}"
-                Stretch="Uniform" />
-        </Viewbox>
+        <Border Background="{TemplateBinding Background}">
+          <Viewbox Height="{TemplateBinding Height}"
+                   Width="{TemplateBinding Width}">
+            <Path Fill="{TemplateBinding Foreground}"
+                  Data="{TemplateBinding Data}"
+                  Stretch="Uniform" />
+          </Viewbox>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>