Windows 11 Theming Changes

Documentation/projects-and-assemblies.md

@@ -118,9 +118,11 @@ The following assemblies are being produced today:
     |   PresentationFramework.dll
     |   PresentationFramework.Luna.dll
     |   PresentationFramework.Luna.pdb
-    |   PresentationFramework.pdb
+    |   PresentationFramework.pdb 
     |   PresentationFramework.Royale.dll
     |   PresentationFramework.Royale.pdb
+    |   PresentationFramework.FluentWindows.dll
+    |   PresentationFramework.FluentWindows.pdb
     |   PresentationUI.dll
     |   PresentationUI.pdb
     |   ReachFramework.dll
@@ -452,7 +454,8 @@ src\Themes\PresentationFramework.Luna\PresentationFramework.Luna.csproj
 src\Themes\PresentationFramework.Luna\ref\PresentationFramework.Luna-ref.csproj
 src\Themes\PresentationFramework.Royale\PresentationFramework.Royale.csproj
 src\Themes\PresentationFramework.Royale\ref\PresentationFramework.Royale-ref.csproj
-
+src\Themes\PresentationFramework.FluentWindows\PresentationFramework.FluentWindows.csproj
+src\Themes\PresentationFramework.FluentWindows\ref\PresentationFramework.FluentWindows-ref.csproj
 src\UIAutomation\UIAutomationClient\UIAutomationClient.csproj
 src\UIAutomation\UIAutomationClient\ref\UIAutomationClient-ref.csproj
 src\UIAutomation\UIAutomationClientSideProviders\UIAutomationClientSideProviders.csproj

Microsoft.Dotnet.Wpf.sln

@@ -249,6 +249,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xaml.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\System.Xaml.Tests\System.Xaml.Tests.csproj", "{B2F2A89C-55C9-41B1-A645-0948609BD8BE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.FluentWindows", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.FluentWindows\PresentationFramework.FluentWindows.csproj", "{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.FluentWindows-ref", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.FluentWindows\ref\PresentationFramework.FluentWindows-ref.csproj", "{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1942,6 +1946,38 @@ Global
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|Win32
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|Win32
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Deploy.0 = Release|Win32
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|ARM64.Build.0 = Debug|arm64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|x64.ActiveCfg = Debug|x64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|x64.Build.0 = Debug|x64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|ARM64.ActiveCfg = Release|arm64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|ARM64.Build.0 = Release|arm64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|x64.ActiveCfg = Release|x64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|x64.Build.0 = Release|x64
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Release|x86.Build.0 = Release|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|ARM64.Build.0 = Debug|arm64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|x64.ActiveCfg = Debug|x64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|x64.Build.0 = Debug|x64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Debug|x86.Build.0 = Debug|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|ARM64.ActiveCfg = Release|arm64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|ARM64.Build.0 = Release|arm64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x64.ActiveCfg = Release|x64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x64.Build.0 = Release|x64
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2062,6 +2098,8 @@ Global
 		{34B64A4A-7C83-4F92-8C47-80E9FA10D660} = {C9ECC1A1-917F-43D3-B340-2035B4938507}
 		{A48B585E-6AB0-4F8D-8484-77F37CB44437} = {34B64A4A-7C83-4F92-8C47-80E9FA10D660}
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE} = {A48B585E-6AB0-4F8D-8484-77F37CB44437}
+		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9} = {5ACFB055-649D-4A01-98C2-B0BFE7E543D6}
+		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD} = {60F4058B-D35B-42D2-B276-D44B3AC579BD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567}

eng/WpfArcadeSdk/tools/GenApi.props

@@ -10,6 +10,7 @@
       PresentationFramework.Classic;
       PresentationFramework.Luna;
       PresentationFramework.Royale;
+      PresentationFramework.FluentWindows;
       ReachFramework;
       System.Windows.Controls.Ribbon;
       System.Windows.Input.Manipulations;

eng/WpfArcadeSdk/tools/ShippingProjects.props

@@ -28,6 +28,7 @@
       PresentationFramework.Classic;
       PresentationFramework.Luna;
       PresentationFramework.Royale;
+      PresentationFramework.FluentWindows;
       WindowsFormsIntegration;
       PenImc;
       wpfgfx;
@@ -98,6 +99,7 @@
       PresentationFramework.Classic-ref;
       PresentationFramework.Luna-ref;
       PresentationFramework.Royale-ref;
+      PresentationFramework.FluentWindows-ref;
       PresentationUI-ref;
       System.Printing-ref;
       System.Windows.Controls.Ribbon-ref;
@@ -136,6 +138,8 @@
       PresentationFramework.Luna-ref;
       PresentationFramework.Royale;
       PresentationFramework.Royale-ref;
+      PresentationFramework.FluentWindows;
+      PresentationFramework.FluentWindows-ref;
       PresentationUI;
       ReachFramework;
       ReachFramework-ref;

eng/WpfArcadeSdk/tools/WpfProjectReference.targets

@@ -47,7 +47,7 @@
     <WpfProjectPath Include="PresentationFramework.Classic" ProjectPath="$(WpfSourceDir)Themes\PresentationFramework.Classic\PresentationFramework.Classic.csproj" />
     <WpfProjectPath Include="PresentationFramework.Luna" ProjectPath="$(WpfSourceDir)Themes\PresentationFramework.Luna\PresentationFramework.Luna.csproj" />
     <WpfProjectPath Include="PresentationFramework.Royale" ProjectPath="$(WpfSourceDir)Themes\PresentationFramework.Royale\PresentationFramework.Royale.csproj" />
-
+    <WpfProjectPath Include="PresentationFramework.FluentWindows" ProjectPath="$(WpfSourceDir)Themes\PresentationFramework.FluentWindows\PresentationFramework.FluentWindows.csproj" />
     <WpfProjectPath Include="UIAutomationTypes" ProjectPath="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
     <WpfProjectPath Include="UIAutomationProvider" ProjectPath="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
     <WpfProjectPath Include="UIAutomationClient" ProjectPath="$(WpfSourceDir)UIAutomation\UIAutomationClient\UIAutomationClient.csproj" />

src/Microsoft.DotNet.Wpf/src/PresentationFramework/OtherAssemblyAttrs.cs

@@ -37,7 +37,7 @@
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFrameworkSystemCore)]
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFrameworkSystemXml)]
 [assembly:InternalsVisibleTo(BuildInfo.SystemWindowsControlsRibbon)]
-
+[assembly:InternalsVisibleTo(BuildInfo.PresentationFrameworkFluentWindows)]
 [assembly:DependencyAttribute("mscorlib,", LoadHint.Always)]
 [assembly:DependencyAttribute("System,", LoadHint.Always)]
 [assembly:DependencyAttribute("WindowsBase,", LoadHint.Always)]

src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj

@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
@@ -420,6 +419,9 @@
     <Compile Include="System\Windows\Annotations\Storage\AnnotationStore.cs" />
     <Compile Include="System\Windows\Annotations\Storage\StoreContentChangedEventArgs.cs" />
     <Compile Include="System\Windows\Annotations\Storage\XmlStreamStore.cs" />
+    <Compile Include="System\Windows\Appearance\ApplicationTheme.cs" />
+    <Compile Include="System\Windows\Appearance\WindowBackdrop.cs" />
+    <Compile Include="System\Windows\Appearance\WindowBackgroundManager.cs" />
     <Compile Include="System\Windows\Application.cs" />
     <Compile Include="System\Windows\AttachedPropertyBrowsableForChildrenAttribute.cs" />
     <Compile Include="System\Windows\Automation\Peers\ButtonAutomationPeer.cs" />
@@ -1087,6 +1089,7 @@
     <Compile Include="System\Windows\Documents\XamlToRtfWriter.cs" />
     <Compile Include="System\Windows\Documents\XPSS0ValidatingLoader.cs" />
     <Compile Include="System\Windows\Documents\ZoomPercentageConverter.cs" />
+    <Compile Include="System\Windows\DwmColorization.cs" />
     <Compile Include="System\Windows\DynamicResourceExtension.cs" />
     <Compile Include="System\Windows\DynamicResourceExtensionConverter.cs" />
     <Compile Include="System\Windows\EventSetter.cs" />
@@ -1123,6 +1126,7 @@
     <Compile Include="System\Windows\Interop\HwndHost.cs" />
     <Compile Include="System\Windows\Interop\IErrorPage.cs" />
     <Compile Include="System\Windows\Interop\IProgressPage.cs" />
+    <Compile Include="System\Windows\Interop\UnsafeNativeMethodsWindow.cs" />
     <Compile Include="System\Windows\Interop\WindowInteropHelper.cs" />
     <Compile Include="System\Windows\IWindowService.cs" />
     <Compile Include="System\Windows\LengthConverter.cs" />
@@ -1340,6 +1344,7 @@
     <Compile Include="System\Windows\TemplatePartAttribute.cs" />
     <Compile Include="System\Windows\TemplateVisualStateAttribute.cs" />
     <Compile Include="System\Windows\TextPanelProperties.cs" />
+    <Compile Include="System\Windows\ThemeColorization.cs" />
     <Compile Include="System\Windows\ThemeDictionaryExtension.cs" />
     <Compile Include="System\Windows\ThemeInfoAttribute.cs" />
     <Compile Include="System\Windows\Thickness.cs" />
@@ -1357,6 +1362,7 @@
     <Compile Include="System\Windows\VisualStateManager.cs" />
     <Compile Include="System\Windows\VisualTransition.cs" />
     <Compile Include="System\Windows\Window.cs" />
+    <Compile Include="System\Windows\WindowBackdropType.cs" />
     <Compile Include="System\Windows\WindowCollection.cs" />
   </ItemGroup>
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Appearance/ApplicationTheme.cs

@@ -0,0 +1,32 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+namespace System.Windows.Appearance;
+
+/// <summary>
+/// Theme in which an application using WPF UI is displayed.
+/// </summary>
+internal enum ApplicationTheme
+{
+    /// <summary>
+    /// Unknown application theme.
+    /// </summary>
+    Unknown,
+
+    /// <summary>
+    /// Dark application theme.
+    /// </summary>
+    Dark,
+
+    /// <summary>
+    /// Light application theme.
+    /// </summary>
+    Light,
+
+    /// <summary>
+    /// High contract application theme.
+    /// </summary>
+    HighContrast
+}