Skip to content

Combining backdrop disabled and default window styles #9425

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
merged 1 commit into from
Jul 18, 2024
Merged

Combining backdrop disabled and default window styles #9425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
11 changes: 7 additions & 4 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,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"
Expand Down Expand Up @@ -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>