Skip to content

[release/10.0] Fix Fluent in Windows 10 #11342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dipeshmsft merged 4 commits into from
Jan 1, 2026
+130 −12
Merged

[release/10.0] Fix Fluent in Windows 10 #11342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1719471
Fix WindowBackground to adapt to adapt to OS and contrast theme changes
harshit7962 Dec 29, 2025
e5053ee
Generated: Fluent script changes
harshit7962 Dec 29, 2025
38ac203
Fix Fluent generator script to include namespaces according to the ch…
harshit7962 Dec 30, 2025
9880f35
Incorporate PR comments
harshit7962 Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/Themes/Generator/ThemeGenerator.Fluent.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ foreach($themeColor in $themeColors)
xmlns:system="clr-namespace:System;assembly=System.Runtime"
xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI"
xmlns:theme="clr-namespace:Microsoft.Windows.Themes"
xmlns:framework="clr-namespace:MS.Internal;assembly=PresentationFramework"
xmlns:ms="clr-namespace:MS.Internal;assembly=PresentationFramework"
xmlns:standard="clr-namespace:Standard;assembly=PresentationFramework"
xmlns:base="clr-namespace:System.Windows;assembly=WindowsBase">
</ResourceDictionary>'

Expand Down
31 changes: 28 additions & 3 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Window.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<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:ms="clr-namespace:MS.Internal;assembly=PresentationFramework"
xmlns:standard="clr-namespace:Standard;assembly=PresentationFramework"
xmlns:controls="clr-namespace:Fluent.Controls">

<ControlTemplate x:Key="WindowTemplateKey"
Expand Down Expand Up @@ -46,6 +47,16 @@
Property="Visibility"
Value="Visible"/>
</MultiTrigger>

<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>

Expand All @@ -63,6 +74,17 @@
<ContentPresenter x:Name="ContentPresenter" />
</AdornerDecorator>
</Border>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
Expand All @@ -75,9 +97,12 @@
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(framework:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</Style.Triggers>
</Style>

Expand Down
27 changes: 25 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Use ThemeGenerator.Fluent.ps1 file to generate this file.
==================================================================-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:System.Windows.Controls;assembly=PresentationFramework" xmlns:fluentcontrols="clr-namespace:Fluent.Controls" xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI" xmlns:theme="clr-namespace:Microsoft.Windows.Themes" xmlns:framework="clr-namespace:MS.Internal;assembly=PresentationFramework" xmlns:base="clr-namespace:System.Windows;assembly=WindowsBase">
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:System.Windows.Controls;assembly=PresentationFramework" xmlns:fluentcontrols="clr-namespace:Fluent.Controls" xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI" xmlns:theme="clr-namespace:Microsoft.Windows.Themes" xmlns:ms="clr-namespace:MS.Internal;assembly=PresentationFramework" xmlns:standard="clr-namespace:Standard;assembly=PresentationFramework" xmlns:base="clr-namespace:System.Windows;assembly=WindowsBase">
<ContextMenu x:Key="DefaultControlContextMenu">
<MenuItem Command="ApplicationCommands.Copy" />
<MenuItem Command="ApplicationCommands.Cut" />
Expand Down Expand Up @@ -5902,6 +5902,15 @@
</MultiTrigger.Conditions>
<Setter TargetName="WindowResizeGrip" Property="Visibility" Value="Visible" />
</MultiTrigger>
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style x:Key="DefaultWindowStyle" TargetType="{x:Type Window}">
Expand All @@ -5916,6 +5925,17 @@
<ContentPresenter x:Name="ContentPresenter" />
</AdornerDecorator>
</Border>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
Expand All @@ -5926,7 +5946,10 @@
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(framework:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</Style.Triggers>
Expand Down
27 changes: 25 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Use ThemeGenerator.Fluent.ps1 file to generate this file.
==================================================================-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:System.Windows.Controls;assembly=PresentationFramework" xmlns:fluentcontrols="clr-namespace:Fluent.Controls" xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI" xmlns:theme="clr-namespace:Microsoft.Windows.Themes" xmlns:framework="clr-namespace:MS.Internal;assembly=PresentationFramework" xmlns:base="clr-namespace:System.Windows;assembly=WindowsBase">
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:System.Windows.Controls;assembly=PresentationFramework" xmlns:fluentcontrols="clr-namespace:Fluent.Controls" xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI" xmlns:theme="clr-namespace:Microsoft.Windows.Themes" xmlns:ms="clr-namespace:MS.Internal;assembly=PresentationFramework" xmlns:standard="clr-namespace:Standard;assembly=PresentationFramework" xmlns:base="clr-namespace:System.Windows;assembly=WindowsBase">
<ContextMenu x:Key="DefaultControlContextMenu">
<MenuItem Command="ApplicationCommands.Copy" />
<MenuItem Command="ApplicationCommands.Cut" />
Expand Down Expand Up @@ -5802,6 +5802,15 @@
</MultiTrigger.Conditions>
<Setter TargetName="WindowResizeGrip" Property="Visibility" Value="Visible" />
</MultiTrigger>
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style x:Key="DefaultWindowStyle" TargetType="{x:Type Window}">
Expand All @@ -5816,6 +5825,17 @@
<ContentPresenter x:Name="ContentPresenter" />
</AdornerDecorator>
</Border>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
Expand All @@ -5826,7 +5846,10 @@
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(framework:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</Style.Triggers>
Expand Down
27 changes: 25 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Use ThemeGenerator.Fluent.ps1 file to generate this file.
==================================================================-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:System.Windows.Controls;assembly=PresentationFramework" xmlns:fluentcontrols="clr-namespace:Fluent.Controls" xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI" xmlns:theme="clr-namespace:Microsoft.Windows.Themes" xmlns:framework="clr-namespace:MS.Internal;assembly=PresentationFramework" xmlns:base="clr-namespace:System.Windows;assembly=WindowsBase">
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:System.Windows.Controls;assembly=PresentationFramework" xmlns:fluentcontrols="clr-namespace:Fluent.Controls" xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI" xmlns:theme="clr-namespace:Microsoft.Windows.Themes" xmlns:ms="clr-namespace:MS.Internal;assembly=PresentationFramework" xmlns:standard="clr-namespace:Standard;assembly=PresentationFramework" xmlns:base="clr-namespace:System.Windows;assembly=WindowsBase">
<ContextMenu x:Key="DefaultControlContextMenu">
<MenuItem Command="ApplicationCommands.Copy" />
<MenuItem Command="ApplicationCommands.Cut" />
Expand Down Expand Up @@ -5917,6 +5917,15 @@
</MultiTrigger.Conditions>
<Setter TargetName="WindowResizeGrip" Property="Visibility" Value="Visible" />
</MultiTrigger>
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style x:Key="DefaultWindowStyle" TargetType="{x:Type Window}">
Expand All @@ -5931,6 +5940,17 @@
<ContentPresenter x:Name="ContentPresenter" />
</AdornerDecorator>
</Border>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
Expand All @@ -5941,7 +5961,10 @@
<DataTrigger Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(framework:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<DataTrigger Binding="{Binding Path=(ms:FrameworkAppContextSwitches.DisableFluentThemeWindowBackdrop)}" Value="True">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=(standard:Utility.IsOSWindows11OrNewer)}" Value="False">
<Setter Property="Background" Value="{DynamicResource WindowBackground}" />
</DataTrigger>
</Style.Triggers>
Expand Down
Loading