From ef6cb2eb14c4ac81f4c9c5b1fe398dec855cbdd2 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 16 Oct 2021 23:38:52 -0400
Subject: [PATCH] Do not override default (null) popup background

---
 src/Avalonia.Themes.Default/OverlayPopupHost.xaml         | 1 -
 src/Avalonia.Themes.Default/PopupRoot.xaml                | 1 -
 src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml | 1 -
 src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml        | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
index 998b0078cf..f054280e06 100644
--- a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
@@ -1,7 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui" 
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        Selector="OverlayPopupHost">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
diff --git a/src/Avalonia.Themes.Default/PopupRoot.xaml b/src/Avalonia.Themes.Default/PopupRoot.xaml
index b1a6ac0beb..b9f68c8421 100644
--- a/src/Avalonia.Themes.Default/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/PopupRoot.xaml
@@ -1,7 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        Selector="PopupRoot">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index a755f979d2..c0c56f2ff3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -1,5 +1,4 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
-  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
   <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
   <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
   <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index 865b4f44c2..f282586908 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="PopupRoot">
     <Setter Property="TransparencyLevelHint" Value="Transparent" />
-    <Setter Property="Background" Value="{x:Null}" />
     <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />