From b55e3f67a68eb4f9dfee1d2955d27635aeb53160 Mon Sep 17 00:00:00 2001
From: dipeshmsft <dipeshkumar@microsoft.com>
Date: Thu, 18 Jul 2024 11:50:21 +0530
Subject: [PATCH] Combined Window styles

---
 .../PresentationFramework/System/Windows/Window.cs    |  9 +--------
 .../PresentationFramework.Fluent/Styles/Window.xaml   | 11 +++++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
index 703b5ceb4f0..84a0c3972a7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
@@ -3583,14 +3583,7 @@ private void Initialize()
             // TODO : Remove when Fluent theme is enabled by default
             if (ThemeManager.IsFluentThemeEnabled)
             {
-                if(WindowBackdropManager.IsBackdropEnabled)
-                {
-                    SetResourceReference(StyleProperty, typeof(Window));
-                }
-                else
-                {
-                    SetResourceReference(StyleProperty, "BackdropDisabledWindowStyle");
-                }
+                SetResourceReference(StyleProperty, typeof(Window));
             }
         }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Window.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Window.xaml
index e94d5a0e416..9261b799c53 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Window.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Window.xaml
@@ -8,6 +8,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:framework="clr-namespace:MS.Internal;assembly=PresentationFramework"
     xmlns:controls="clr-namespace:Fluent.Controls">
 
     <ControlTemplate x:Key="WindowTemplateKey"
@@ -71,13 +72,15 @@
                 <Setter Property="Template"
                         Value="{StaticResource WindowTemplateKey}"/>
             </Trigger>
+            <DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WindowBackground}" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=(framework:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WindowBackground}" />
+            </DataTrigger>  
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="BackdropDisabledWindowStyle" BasedOn="{StaticResource DefaultWindowStyle}" TargetType="{x:Type Window}" >
-        <Setter Property="Background" Value="{DynamicResource WindowBackground}" />
-    </Style>
-
     <Style BasedOn="{StaticResource DefaultWindowStyle}" TargetType="{x:Type Window}" />
 
 </ResourceDictionary>