From c04adbf6418963f886008558e7eafc70991036d4 Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Sun, 19 Jan 2025 22:52:08 +0330 Subject: [PATCH] Update ThemeService.Configs.cs #26 --- .../ThemeService/ThemeService.Configs.cs | 115 ++++++++---------- 1 file changed, 50 insertions(+), 65 deletions(-) diff --git a/dev/DevWinUI/Services/ThemeService/ThemeService.Configs.cs b/dev/DevWinUI/Services/ThemeService/ThemeService.Configs.cs index 7e2ca9a6..c4f9bf54 100644 --- a/dev/DevWinUI/Services/ThemeService/ThemeService.Configs.cs +++ b/dev/DevWinUI/Services/ThemeService/ThemeService.Configs.cs @@ -41,44 +41,36 @@ private void ConfigTintColorBase(Color color, bool force) } private void ConfigTintColorBase() { - foreach (var window in WindowHelper.ActiveWindows) + if (IsDarkTheme()) { - var systemBackdrop = window.SystemBackdrop; - if (systemBackdrop != null) + switch (GetBackdropType()) { - if (IsDarkTheme()) - { - switch (GetBackdropType()) - { - case BackdropType.Mica: - ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_Dark, false); - break; - case BackdropType.MicaAlt: - ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_MicaAlt_Dark, false); - break; - case BackdropType.AcrylicThin: - case BackdropType.AcrylicBase: - ConfigTintColorBase(AcrylicSystemBackdrop.Default_TintColor_Dark, false); - break; - } - } - else - { - switch (GetBackdropType()) - { - case BackdropType.Mica: - ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_Light, false); - break; - case BackdropType.MicaAlt: - ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_MicaAlt_Light, false); - break; - case BackdropType.AcrylicThin: - case BackdropType.AcrylicBase: - ConfigTintColorBase(AcrylicSystemBackdrop.Default_TintColor_Light, false); - break; - } - } - + case BackdropType.Mica: + ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_Dark, false); + break; + case BackdropType.MicaAlt: + ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_MicaAlt_Dark, false); + break; + case BackdropType.AcrylicThin: + case BackdropType.AcrylicBase: + ConfigTintColorBase(AcrylicSystemBackdrop.Default_TintColor_Dark, false); + break; + } + } + else + { + switch (GetBackdropType()) + { + case BackdropType.Mica: + ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_Light, false); + break; + case BackdropType.MicaAlt: + ConfigTintColorBase(MicaSystemBackdrop.Default_TintColor_MicaAlt_Light, false); + break; + case BackdropType.AcrylicThin: + case BackdropType.AcrylicBase: + ConfigTintColorBase(AcrylicSystemBackdrop.Default_TintColor_Light, false); + break; } } } @@ -98,37 +90,30 @@ private void ConfigFallbackColorBase(Color color, bool force) private void ConfigFallbackColorBase() { - foreach (var window in WindowHelper.ActiveWindows) + if (IsDarkTheme()) + { + switch (GetBackdropType()) + { + case BackdropType.MicaAlt: + ConfigFallbackColorBase(MicaSystemBackdrop.Default_FallbackColor_MicaAlt_Dark, false); + break; + case BackdropType.AcrylicThin: + case BackdropType.AcrylicBase: + ConfigFallbackColorBase(AcrylicSystemBackdrop.Default_FallbackColor_Dark, false); + break; + } + } + else { - var systemBackdrop = window.SystemBackdrop; - if (systemBackdrop != null) + switch (GetBackdropType()) { - if (IsDarkTheme()) - { - switch (GetBackdropType()) - { - case BackdropType.MicaAlt: - ConfigFallbackColorBase(MicaSystemBackdrop.Default_FallbackColor_MicaAlt_Dark, false); - break; - case BackdropType.AcrylicThin: - case BackdropType.AcrylicBase: - ConfigFallbackColorBase(AcrylicSystemBackdrop.Default_FallbackColor_Dark, false); - break; - } - } - else - { - switch (GetBackdropType()) - { - case BackdropType.MicaAlt: - ConfigFallbackColorBase(MicaSystemBackdrop.Default_FallbackColor_MicaAlt_Light, false); - break; - case BackdropType.AcrylicThin: - case BackdropType.AcrylicBase: - ConfigFallbackColorBase(AcrylicSystemBackdrop.Default_FallbackColor_Light, false); - break; - } - } + case BackdropType.MicaAlt: + ConfigFallbackColorBase(MicaSystemBackdrop.Default_FallbackColor_MicaAlt_Light, false); + break; + case BackdropType.AcrylicThin: + case BackdropType.AcrylicBase: + ConfigFallbackColorBase(AcrylicSystemBackdrop.Default_FallbackColor_Light, false); + break; } } }