Update ThemeService.Set.cs #26

ghost1372 · Jan 19, 2025 · c38cb2c · c38cb2c
1 parent c04adbf
commit c38cb2c
Showing 1 changed file with 21 additions and 24 deletions.
diff --git a/dev/DevWinUI/Services/ThemeService/ThemeService.Set.cs b/dev/DevWinUI/Services/ThemeService/ThemeService.Set.cs
@@ -1,6 +1,7 @@
 
 using Microsoft.UI.Composition.SystemBackdrops;
 using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml.Media;
 
 namespace DevWinUI;
 public partial class ThemeService
@@ -54,51 +55,47 @@ public void SetElementThemeWithoutSave(ElementTheme elementTheme)
 
     public void SetBackdropTintColor(Color color)
     {
-        foreach (var window in WindowHelper.ActiveWindows)
+        DispatcherQueue.GetForCurrentThread().TryEnqueue(() =>
         {
-            var systemBackdrop = window.SystemBackdrop;
-            if (systemBackdrop != null)
+            foreach (var window in WindowHelper.ActiveWindows)
             {
-                if (systemBackdrop is MicaSystemBackdrop mica)
+                if (window.SystemBackdrop is MicaSystemBackdrop mica)
                 {
                     mica.TintColor = color;
                 }
-                else if (systemBackdrop is AcrylicSystemBackdrop acrylic)
+                else if (window.SystemBackdrop is AcrylicSystemBackdrop acrylic)
                 {
                     acrylic.TintColor = color;
                 }
-
-                if (useAutoSave && GlobalData.Config != null && GlobalData.Config.BackdropTintColor != color)
-                {
-                    GlobalData.Config.BackdropTintColor = color;
-                    GlobalData.Save();
-                }
             }
-        }
+            if (useAutoSave && GlobalData.Config != null && GlobalData.Config.BackdropTintColor != color)
+            {
+                GlobalData.Config.BackdropTintColor = color;
+                GlobalData.Save();
+            }
+        });
     }
 
     public void SetBackdropFallbackColor(Color color)
     {
-        foreach (var window in WindowHelper.ActiveWindows)
+        DispatcherQueue.GetForCurrentThread().TryEnqueue(() =>
         {
-            var systemBackdrop = window.SystemBackdrop;
-            if (systemBackdrop != null)
+            foreach (var window in WindowHelper.ActiveWindows)
             {
-                if (systemBackdrop is MicaSystemBackdrop mica)
+                if (window.SystemBackdrop is MicaSystemBackdrop mica)
                 {
                     mica.FallbackColor = color;
                 }
-                else if (systemBackdrop is AcrylicSystemBackdrop acrylic)
+                else if (window.SystemBackdrop is AcrylicSystemBackdrop acrylic)
                 {
                     acrylic.FallbackColor = color;
                 }
-
-                if (useAutoSave && GlobalData.Config != null && GlobalData.Config.BackdropFallBackColor != color)
-                {
-                    GlobalData.Config.BackdropFallBackColor = color;
-                    GlobalData.Save();
-                }
             }
-        }
+            if (useAutoSave && GlobalData.Config != null && GlobalData.Config.BackdropFallBackColor != color)
+            {
+                GlobalData.Config.BackdropFallBackColor = color;
+                GlobalData.Save();
+            }
+        });
     }
 }