Enabling Windows 10 support for Fluent Themes (#9407)

harshit7962 · web-flow · commit 15e362e4bbd0 · 2024-07-17T14:04:35.000+05:30
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
@@ -132,7 +132,7 @@ private static void ApplyTheme(
     /// <returns></returns>
     private static bool SetImmersiveDarkMode(Window window, bool useDarkMode)
     {
-        if (window == null)
+        if (window == null || !Utility.IsOSWindows11OrNewer)
         {
             return false;
         }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
@@ -2515,7 +2515,7 @@ internal void CreateSourceWindow(bool duringShow)
                 UnsafeNativeMethods.ChangeWindowMessageFilterEx(_swh.CriticalHandle, WindowMessage.WM_COMMAND, MSGFLT.ALLOW, out info);
             }
 
-            if (Standard.Utility.IsOSWindows11OrNewer && ThemeManager.IsFluentThemeEnabled)
+            if (Standard.Utility.IsOSWindows10OrNewer && ThemeManager.IsFluentThemeEnabled)
             {
                 ThemeManager.InitializeFluentTheme();
                 ThemeManager.ApplySystemTheme(this, true);

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ private static void ApplyTheme(`
`132`	`132`	`/// <returns></returns>`
`133`	`133`	`private static bool SetImmersiveDarkMode(Window window, bool useDarkMode)`
`134`	`134`	`{`
`135`		`- if (window == null)`
	`135`	`+ if (window == null \|\| !Utility.IsOSWindows11OrNewer)`
`136`	`136`	`{`
`137`	`137`	`return false;`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2515,7 +2515,7 @@ internal void CreateSourceWindow(bool duringShow)`
`2515`	`2515`	`UnsafeNativeMethods.ChangeWindowMessageFilterEx(_swh.CriticalHandle, WindowMessage.WM_COMMAND, MSGFLT.ALLOW, out info);`
`2516`	`2516`	`}`
`2517`	`2517`
`2518`		`- if (Standard.Utility.IsOSWindows11OrNewer && ThemeManager.IsFluentThemeEnabled)`
	`2518`	`+ if (Standard.Utility.IsOSWindows10OrNewer && ThemeManager.IsFluentThemeEnabled)`
`2519`	`2519`	`{`
`2520`	`2520`	`ThemeManager.InitializeFluentTheme();`
`2521`	`2521`	`ThemeManager.ApplySystemTheme(this, true);`