Fix UI thread issue and preview

Flow.Launcher.Core/Resource/Theme.cs

@@ -132,50 +132,64 @@ namespace Flow.Launcher.Core.Resource
                 => DwmSetWindowAttribute(hwnd, attribute, ref parameter, Marshal.SizeOf<int>());
         }
 
-        System.Windows.Window mainWindow = Application.Current.MainWindow;
+        private System.Windows.Window GetMainWindow()
+        {
+            return Application.Current.Dispatcher.Invoke(() => Application.Current.MainWindow);
+        }
+
 
         public void RefreshFrame()
         {
-            IntPtr mainWindowPtr = new WindowInteropHelper(mainWindow).Handle;
+            Application.Current.Dispatcher.Invoke(() =>
-            if (mainWindowPtr == IntPtr.Zero)
-                return;
-
-            HwndSource mainWindowSrc = HwndSource.FromHwnd(mainWindowPtr);
-            if (mainWindowSrc == null)
-                return;
-
-            ParameterTypes.MARGINS margins = new ParameterTypes.MARGINS();
-            margins.cxLeftWidth = -1;
-            margins.cxRightWidth = -1;
-            margins.cyTopHeight = -1;
-            margins.cyBottomHeight = -1;
-            Methods.ExtendFrame(mainWindowSrc.Handle, margins);
-
-            // Remove OS minimizing/maximizing animation
-            // Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, 3);
-
-            // Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_BORDER_COLOR, 0x00FF0000);
-            // Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3);
-
-            // The timing of adding the shadow effect should vary depending on whether the theme is transparent.
-            if (BlurEnabled)
             {
-                AutoDropShadow();
+                System.Windows.Window mainWindow = Application.Current.MainWindow;
-            }
+                if (mainWindow == null)
-            SetBlurForWindow();
+                    return;
 
-            if (!BlurEnabled)
+                IntPtr mainWindowPtr = new WindowInteropHelper(mainWindow).Handle;
-            {
+                if (mainWindowPtr == IntPtr.Zero)
-                AutoDropShadow();
+                    return;
-            }
+
+                HwndSource mainWindowSrc = HwndSource.FromHwnd(mainWindowPtr);
+                if (mainWindowSrc == null)
+                    return;
+
+                ParameterTypes.MARGINS margins = new ParameterTypes.MARGINS();
+                margins.cxLeftWidth = -1;
+                margins.cxRightWidth = -1;
+                margins.cyTopHeight = -1;
+                margins.cyBottomHeight = -1;
+                Methods.ExtendFrame(mainWindowSrc.Handle, margins);
+
+                // Remove OS minimizing/maximizing animation
+                // Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, 3);
+
+                // Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_BORDER_COLOR, 0x00FF0000);
+                // Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3);
+
+                // The timing of adding the shadow effect should vary depending on whether the theme is transparent.
+                if (BlurEnabled)
+                {
+                    AutoDropShadow();
+                }
+                SetBlurForWindow();
+
+                if (!BlurEnabled)
+                {
+                    AutoDropShadow();
+                }
+            }, DispatcherPriority.Normal);
         }
 
 
+
         public void AutoDropShadow()
         {
+            SetWindowCornerPreference("Default");
+            RemoveDropShadowEffectFromCurrentTheme();
             if (_settings.UseDropShadowEffect)
             {
-                RemoveDropShadowEffectFromCurrentTheme();
+                //RemoveDropShadowEffectFromCurrentTheme();
                 if (BlurEnabled)
                 {
                     SetWindowCornerPreference("Round");
@@ -188,7 +202,7 @@ namespace Flow.Launcher.Core.Resource
             }
             else
             {
-                RemoveDropShadowEffectFromCurrentTheme();
+                //RemoveDropShadowEffectFromCurrentTheme();
                 if (BlurEnabled)
                 {
                     SetWindowCornerPreference("Default");
@@ -202,108 +216,130 @@ namespace Flow.Launcher.Core.Resource
 
         public void SetWindowCornerPreference(string cornerType)
         {
-            DWM_WINDOW_CORNER_PREFERENCE preference = cornerType switch
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                "DoNotRound" => DWM_WINDOW_CORNER_PREFERENCE.DoNotRound,
+                System.Windows.Window mainWindow = GetMainWindow();
-                "Round" => DWM_WINDOW_CORNER_PREFERENCE.Round,
+                if (mainWindow == null)
-                "RoundSmall" => DWM_WINDOW_CORNER_PREFERENCE.RoundSmall,
+                    return;
-                "Default" => DWM_WINDOW_CORNER_PREFERENCE.Default,
-                _ => DWM_WINDOW_CORNER_PREFERENCE.Default,
-            };
 
-            SetWindowCornerPreference(mainWindow, preference);
+                DWM_WINDOW_CORNER_PREFERENCE preference = cornerType switch
-        }
-
-        public void SetCornerForWindow()
-        {
-            var dict = GetThemeResourceDictionary(_settings.Theme);
-            if (dict == null)
-                return;
-            if (dict.Contains("CornerType") && dict["CornerType"] is string cornerMode)
-            {
-                DWM_WINDOW_CORNER_PREFERENCE preference = cornerMode switch
                 {
                     "DoNotRound" => DWM_WINDOW_CORNER_PREFERENCE.DoNotRound,
                     "Round" => DWM_WINDOW_CORNER_PREFERENCE.Round,
                     "RoundSmall" => DWM_WINDOW_CORNER_PREFERENCE.RoundSmall,
+                    "Default" => DWM_WINDOW_CORNER_PREFERENCE.Default,
                     _ => DWM_WINDOW_CORNER_PREFERENCE.Default,
                 };
 
                 SetWindowCornerPreference(mainWindow, preference);
-           
+            }, DispatcherPriority.Normal);
-            }
-            else
-            {
-                SetWindowCornerPreference(mainWindow, DWM_WINDOW_CORNER_PREFERENCE.Default);
- 
-            }
         }
 
+
+        public void SetCornerForWindow()
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                var dict = GetThemeResourceDictionary(_settings.Theme);
+                if (dict == null)
+                    return;
+
+                System.Windows.Window mainWindow = Application.Current.MainWindow;
+                if (mainWindow == null)
+                    return;
+
+                if (dict.Contains("CornerType") && dict["CornerType"] is string cornerMode)
+                {
+                    DWM_WINDOW_CORNER_PREFERENCE preference = cornerMode switch
+                    {
+                        "DoNotRound" => DWM_WINDOW_CORNER_PREFERENCE.DoNotRound,
+                        "Round" => DWM_WINDOW_CORNER_PREFERENCE.Round,
+                        "RoundSmall" => DWM_WINDOW_CORNER_PREFERENCE.RoundSmall,
+                        _ => DWM_WINDOW_CORNER_PREFERENCE.Default,
+                    };
+
+                    SetWindowCornerPreference(mainWindow, preference);
+                }
+                else
+                {
+                    SetWindowCornerPreference(mainWindow, DWM_WINDOW_CORNER_PREFERENCE.Default);
+                }
+            }, DispatcherPriority.Normal);
+        }
+
+
         /// <summary>
         /// Sets the blur for a window via SetWindowCompositionAttribute
         /// </summary>
         public void SetBlurForWindow()
         {
-            var dict = GetThemeResourceDictionary(_settings.Theme);
+            Application.Current.Dispatcher.Invoke(() =>
-            if (dict == null)
-                return;
-
-            var windowBorderStyle = dict["WindowBorderStyle"] as Style;
-            if (windowBorderStyle == null)
-                return;
-
-            // ✅ 설정된 BackdropType 확인
-            int backdropValue = _settings.BackdropType switch
             {
-                BackdropTypes.Acrylic => 3, // Acrylic (DWM_SYSTEMBACKDROP_TYPE = 2)
+                var dict = GetThemeResourceDictionary(_settings.Theme);
-                BackdropTypes.Mica => 2,    // Mica (DWM_SYSTEMBACKDROP_TYPE = 3)
+                if (dict == null)
-                BackdropTypes.MicaAlt => 4, // MicaAlt (DWM_SYSTEMBACKDROP_TYPE = 4)
+                    return;
-                _ => 0                      // None (DWM_SYSTEMBACKDROP_TYPE = 0)
-            };
 
-            Debug.WriteLine("~~~~~~~~~~~~~~~~~~~~");
+                var windowBorderStyle = dict.Contains("WindowBorderStyle") ? dict["WindowBorderStyle"] as Style : null;
-            Debug.WriteLine($"Backdrop Mode: {BlurMode()}, DWM Value: {backdropValue}");
+                if (windowBorderStyle == null)
+                    return;
 
+                System.Windows.Window mainWindow = GetMainWindow();
+                if (mainWindow == null)
+                    return;
 
-
+                // ✅ 테마가 블러를 지원하는지 확인
-            if (BlurEnabled)
+                bool hasBlur = dict.Contains("ThemeBlurEnabled") && dict["ThemeBlurEnabled"] is bool b && b;
-            {
+                if (!hasBlur)
-                // ✅ Mica 또는 MicaAlt인 경우 배경을 투명하게 설정
-                if (_settings.BackdropType == BackdropTypes.Mica || _settings.BackdropType == BackdropTypes.MicaAlt)
                 {
-                    windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
+                    _settings.BackdropType = BackdropTypes.None;  // 🔥 블러가 없는 테마는 강제 None 처리
-                    windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Color.FromArgb(1, 0, 0, 0)))); // 드래그 가능 투명색
-                    Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
-                    ThemeModeColorforMica(BlurMode()); // ✅ 테마 모드 적용
                 }
-                else if (_settings.BackdropType == BackdropTypes.Acrylic)
+
+                // ✅ 설정된 BackdropType 확인
+                int backdropValue = _settings.BackdropType switch
                 {
-                    windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
+                    BackdropTypes.Acrylic => 3, // Acrylic
-                    windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
+                    BackdropTypes.Mica => 2,    // Mica
-                    //Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3);
+                    BackdropTypes.MicaAlt => 4, // MicaAlt
-                    Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
+                    _ => 0                      // None
-                    ThemeModeColor(BlurMode()); // ✅ 테마 모드 적용
+                };
+
+                if (BlurEnabled && hasBlur)
+                {
+                    // ✅ Mica 또는 MicaAlt인 경우 배경을 투명하게 설정
+                    if (_settings.BackdropType == BackdropTypes.Mica || _settings.BackdropType == BackdropTypes.MicaAlt)
+                    {
+                        windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
+                        windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Color.FromArgb(1, 0, 0, 0))));
+                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
+                        ColorizeWindow(GetSystemBG());
+                    }
+                    else if (_settings.BackdropType == BackdropTypes.Acrylic)
+                    {
+                        windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
+                        windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
+                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
+                        ColorizeWindow(GetSystemBG());
+                    }
+                    else
+                    {
+                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
+                        ColorizeWindow(GetSystemBG());
+                    }
                 }
                 else
                 {
-                    Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
+                    // ✅ Blur가 비활성화되면 기본 스타일 적용
-                    ThemeModeColor(BlurMode()); // ✅ 테마 모드 적용
+                    Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 0);
-                    //windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
+                    ColorizeWindow(GetSystemBG());
-                    //windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
                 }
 
-            }
+                UpdateResourceDictionary(dict);
-            else
+            }, DispatcherPriority.Normal);
-            {
-                // ✅ Blur가 비활성화되면 기본 스타일 적용
-                Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 0);
-                ThemeModeColor(BlurMode());
-            }
-
-            UpdateResourceDictionary(dict);
         }
 
 
+
+
         // Get Background Color from WindowBorderStyle when there not color for BG.
         private Color GetWindowBorderStyleBackground()
         {
@@ -347,249 +383,112 @@ namespace Flow.Launcher.Core.Resource
             return Colors.Transparent; // Default is transparent
         }
 
-        private void ApplyPreviewBackground(Color bgColor)
+        private void ApplyPreviewBackground(Color? bgColor = null)
         {
+            if (bgColor == null) return;
+
             Application.Current.Dispatcher.Invoke(() =>
             {
-                Style baseStyle = null;
+                // 1. 기존 WindowBorderStyle을 복사
-
+                var previewStyle = new Style(typeof(Border));
-                // ✅ `WindowBorderStyle`이 존재하면 가져오기
                 if (Application.Current.Resources.Contains("WindowBorderStyle"))
                 {
-                    baseStyle = Application.Current.Resources["WindowBorderStyle"] as Style;
+                    var originalStyle = Application.Current.Resources["WindowBorderStyle"] as Style;
-                }
+                    if (originalStyle != null)
-
-                // ✅ `WindowBorderStyle`이 없으면 `Base.xaml`의 기본 스타일 사용
-                if (baseStyle == null && Application.Current.Resources.Contains("BaseWindowBorderStyle"))
-                {
-                    baseStyle = Application.Current.Resources["BaseWindowBorderStyle"] as Style;
-                }
-
-                // ✅ 투명도가 존재하면 불투명한 색상으로 변경
-                if (bgColor.A < 255)
-                {
-                    bgColor = Color.FromRgb(bgColor.R, bgColor.G, bgColor.B); // 알파값 제거
-                }
-
-                // ✅ 기존 스타일이 존재하면 복사하여 새로운 스타일 생성
-                if (baseStyle != null)
-                {
-                    var newStyle = new Style(typeof(Border));
-
-                    // ✅ 기존 스타일의 Setter를 복사 (Background 제외)
-                    foreach (var setter in baseStyle.Setters.OfType<Setter>())
                     {
-                        if (setter.Property != Border.BackgroundProperty) // Background는 새 값으로 대체
+                        foreach (var setter in originalStyle.Setters.OfType<Setter>())
                         {
-                            newStyle.Setters.Add(new Setter(setter.Property, setter.Value));
+                            previewStyle.Setters.Add(new Setter(setter.Property, setter.Value));
                         }
                     }
-
-                    // ✅ 새로운 Background Setter 추가
-                    newStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(bgColor)));
-
-                    // ✅ 새 스타일을 `PreviewWindowBorderStyle`로 적용
-                    Application.Current.Resources["PreviewWindowBorderStyle"] = newStyle;
                 }
-                else
-                {
-                    // ✅ `WindowBorderStyle`이 없으면 기본 스타일 생성
-                    var defaultStyle = new Style(typeof(Border));
-                    defaultStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(bgColor)));
-                    defaultStyle.Setters.Add(new Setter(Border.BorderThicknessProperty, new Thickness(0)));
-                    defaultStyle.Setters.Add(new Setter(Border.CornerRadiusProperty, new CornerRadius(5)));
-                    defaultStyle.Setters.Add(new Setter(Border.UseLayoutRoundingProperty, true));
-                    defaultStyle.Setters.Add(new Setter(Border.SnapsToDevicePixelsProperty, true));
 
-                    Application.Current.Resources["PreviewWindowBorderStyle"] = defaultStyle;
+                // 2. 투명도 제거 후 background 적용
-                }
+                Color backgroundColor = Color.FromRgb(bgColor.Value.R, bgColor.Value.G, bgColor.Value.B);
+                previewStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(backgroundColor)));
+
+                // 3. 기타 설정 추가
+                previewStyle.Setters.Add(new Setter(Border.BorderThicknessProperty, new Thickness(0)));
+                previewStyle.Setters.Add(new Setter(Border.CornerRadiusProperty, new CornerRadius(5)));
+                previewStyle.Setters.Add(new Setter(Border.UseLayoutRoundingProperty, true));
+                previewStyle.Setters.Add(new Setter(Border.SnapsToDevicePixelsProperty, true));
+
+                Application.Current.Resources["PreviewWindowBorderStyle"] = previewStyle;
             }, DispatcherPriority.Render);
         }
 
 
-
+        public void ColorizeWindow(string Mode)
-
-        public void ThemeModeColor(string Mode)
         {
-            var dict = GetThemeResourceDictionary(_settings.Theme);
+            Application.Current.Dispatcher.Invoke(() =>
-
-            Color lightBG;
-            Color darkBG;
-
-            // get lightBG value. if not, get windowborderstyle's background.
-            try
             {
-                lightBG = dict.Contains("lightBG") ? (Color)dict["lightBG"] : GetWindowBorderStyleBackground();
+                var dict = GetThemeResourceDictionary(_settings.Theme);
-            }
+                if (dict == null) return;
-            catch (Exception)
-            {
-                // if not lightBG, use windowborderstyle's background.
-                lightBG = GetWindowBorderStyleBackground();
-            }
 
-            // get darkBG value, (if not, use lightBG)
+                var mainWindow = Application.Current.MainWindow;
-            try
+                if (mainWindow == null) return;
-            {
-                darkBG = dict.Contains("darkBG") ? (Color)dict["darkBG"] : lightBG;
-            }
-            catch (Exception)
-            {
-                darkBG = lightBG; // if not darkBG, use lightBG
-            }
 
-            if (Mode == "Auto")
+                // ✅ 블러 테마인지 확인
-            {
+                bool hasBlur = dict.Contains("ThemeBlurEnabled") && dict["ThemeBlurEnabled"] is bool b && b;
-                int themeValue = (int)Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
-                string colorScheme = _settings.ColorScheme;
-                bool isDarkMode = themeValue == 0; // 0 is dark mode.
 
-                if (colorScheme == "System")
+                Color LightBG;
+                Color DarkBG;
+
+                // LightBG 값 가져오기 (없으면 WindowBorderStyle의 배경색 사용)
+                try
                 {
-                    if (isDarkMode)
+                    LightBG = dict.Contains("LightBG") ? (Color)dict["LightBG"] : GetWindowBorderStyleBackground();
-                    {
+                }
-                        ApplyPreviewBackground(darkBG);
+                catch (Exception)
-                        mainWindow.Background = new SolidColorBrush(darkBG);
+                {
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 1);
+                    LightBG = GetWindowBorderStyleBackground();
-                        return;
+                }
-                    }
+
-                    else
+                // DarkBG 값 가져오기 (없으면 LightBG 사용)
-                    {
+                try
-                        ApplyPreviewBackground(lightBG);
+                {
-                        mainWindow.Background = new SolidColorBrush(lightBG);
+                    DarkBG = dict.Contains("DarkBG") ? (Color)dict["DarkBG"] : LightBG;
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0);
+                }
-                        return;
+                catch (Exception)
-                    }
+                {
+                    DarkBG = LightBG;
+                }
+
+                // ✅ 설정의 ColorScheme을 우선 사용
+                int themeValue = (int)Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
+                bool isSystemDark = themeValue == 0;
+                bool useDarkMode = Mode == "Dark" || (Mode == "Auto" && _settings.ColorScheme == "System" && isSystemDark) || (_settings.ColorScheme == "Dark");
+
+                Color selectedBG = useDarkMode ? DarkBG : LightBG;
+                ApplyPreviewBackground(selectedBG);
+
+                // ✅ Windows 10 테마(HasBlur=False)는 mainWindow.Background를 설정하지 않음
+                if (!hasBlur)
+                {
+                    mainWindow.Background = Brushes.Transparent;
                 }
                 else
                 {
-                    if (colorScheme == "Dark")
+                    // ✅ 블러 테마일 경우만 배경을 투명하게 설정
+                    if (_settings.BackdropType == BackdropTypes.Mica || _settings.BackdropType == BackdropTypes.MicaAlt)
                     {
-                        ApplyPreviewBackground(darkBG);
-                        mainWindow.Background = new SolidColorBrush(darkBG);
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 1);
-                        return;
-                    }
-                    else if (colorScheme == "Light")
-                    {
-                        ApplyPreviewBackground(lightBG);
-                        mainWindow.Background = new SolidColorBrush(lightBG);
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0);
-                        return;
-                    }
-                }
-            }
-            else if (Mode == "Dark")
-            {
-                mainWindow.Background = new SolidColorBrush(darkBG);
-                ApplyPreviewBackground(darkBG);
-                Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 1);
-                return;
-            }
-            else if (Mode == "Light")
-            {
-                mainWindow.Background = new SolidColorBrush(lightBG);
-                ApplyPreviewBackground(lightBG);
-                Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0);
-                return;
-            }
-            else
-            {
-                ApplyPreviewBackground(lightBG);
-                mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-            }
-        }
-
-        public void ThemeModeColorforMica(string Mode)
-        {
-            var dict = GetThemeResourceDictionary(_settings.Theme);
-
-            Color lightBG;
-            Color darkBG;
-
-            // get lightBG value. if not, get windowborderstyle's background.
-            try
-            {
-                lightBG = dict.Contains("lightBG") ? (Color)dict["lightBG"] : GetWindowBorderStyleBackground();
-            }
-            catch (Exception)
-            {
-                // if not lightBG, use windowborderstyle's background.
-                lightBG = GetWindowBorderStyleBackground();
-            }
-
-            // get darkBG value, (if not, use lightBG)
-            try
-            {
-                darkBG = dict.Contains("darkBG") ? (Color)dict["darkBG"] : lightBG;
-            }
-            catch (Exception)
-            {
-                darkBG = lightBG; // if not darkBG, use lightBG
-            }
-
-            if (Mode == "Auto")
-            {
-                int themeValue = (int)Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
-                string colorScheme = _settings.ColorScheme;
-                bool isDarkMode = themeValue == 0; // 0 is dark mode.
-
-                if (colorScheme == "System")
-                {
-                    if (isDarkMode)
-                    {
-                        ApplyPreviewBackground(darkBG);
                         mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 1);
-                        return;
                     }
                     else
                     {
-                        ApplyPreviewBackground(lightBG);
+                        mainWindow.Background = new SolidColorBrush(selectedBG);
-                        mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0);
-                        return;
                     }
                 }
-                else
+
-                {
+                // ✅ DWM 다크 모드 적용
-                    if (colorScheme == "Dark")
+                Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, useDarkMode ? 1 : 0);
-                    {
+            }, DispatcherPriority.Normal);
-                        ApplyPreviewBackground(darkBG);
-                        mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 1);
-                        return;
-                    }
-                    else if (colorScheme == "Light")
-                    {
-                        ApplyPreviewBackground(lightBG);
-                        mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-                        Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0);
-                        return;
-                    }
-                }
-            }
-            else if (Mode == "Dark")
-            {
-                ApplyPreviewBackground(darkBG);
-                mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-                Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 1);
-                return;
-            }
-            else if (Mode == "Light")
-            {
-                ApplyPreviewBackground(lightBG);
-                mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-                Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0);
-                return;
-            }
-            else
-            {
-                ApplyPreviewBackground(lightBG);
-                mainWindow.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
-            }
         }
 
 
+
+
+
         public bool IsBlurTheme()
         {
             if (Environment.OSVersion.Version >= new Version(6, 2))
@@ -604,11 +503,11 @@ namespace Flow.Launcher.Core.Resource
 
             return false;
         }
-        public string BlurMode()
+        public string GetSystemBG()
         {
             if (Environment.OSVersion.Version >= new Version(6, 2))
             {
-                var resource = Application.Current.TryFindResource("BlurMode");
+                var resource = Application.Current.TryFindResource("SystemBG");
 
                 if (resource is string)
                     return (string)resource;

Flow.Launcher/MainWindow.xaml.cs

@@ -193,6 +193,7 @@ namespace Flow.Launcher
             {
                 ThemeManager.Instance.RefreshFrame();
             }), DispatcherPriority.Background);
+
             // MouseEventHandler
             PreviewMouseMove += MainPreviewMouseMove;
             CheckFirstLaunch();

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

@@ -41,7 +41,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
                 DropShadowEffect = true;
                 OnPropertyChanged(nameof(IsDropShadowEnabled));
             ThemeManager.Instance.RefreshFrame();
-            //uThemeManager.Instance.SetBlurForWindow();
+            //ThemeManager.Instance.SetBlurForWindow();
         }
     }
     public bool IsBackdropEnabled => SelectedTheme?.HasBlur ?? false;

Flow.Launcher/Themes/BlurBlack Darker.xaml

@@ -12,10 +12,10 @@
     </ResourceDictionary.MergedDictionaries>
 
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
-    <system:String x:Key="BlurMode">Dark</system:String>
+    <system:String x:Key="SystemBG">Dark</system:String>
     <system:String x:Key="CornerType">DoNotRound</system:String>
-    <Color x:Key="lightBG">#C7000000</Color>
+    <Color x:Key="LightBG">#C7000000</Color>
-    <Color x:Key="darkBG">#C7000000</Color>
+    <Color x:Key="DarkBG">#C7000000</Color>
 
     <Style x:Key="WindowRadius" TargetType="{x:Type Border}">
         <Setter Property="CornerRadius" Value="0" />

Flow.Launcher/Themes/BlurBlack.xaml

@@ -11,10 +11,10 @@
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
-    <system:String x:Key="BlurMode">Dark</system:String>
+    <system:String x:Key="SystemBG">Dark</system:String>
     <system:String x:Key="CornerType">DoNotRound</system:String>
-    <Color x:Key="lightBG">#B0000000</Color>
+    <Color x:Key="LightBG">#B0000000</Color>
-    <Color x:Key="darkBG">#B6000000</Color>
+    <Color x:Key="DarkBG">#B6000000</Color>
 
     <Style x:Key="WindowRadius" TargetType="{x:Type Border}">
         <Setter Property="CornerRadius" Value="0" />

Flow.Launcher/Themes/BlurWhite.xaml

@@ -11,10 +11,10 @@
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
-    <system:String x:Key="BlurMode">Light</system:String>
+    <system:String x:Key="SystemBG">Light</system:String>
     <system:String x:Key="CornerType">DoNotRound</system:String>
-    <Color x:Key="lightBG">#BFFAFAFA</Color>
+    <Color x:Key="LightBG">#BFFAFAFA</Color>
-    <Color x:Key="darkBG">#BFFAFAFA</Color>
+    <Color x:Key="DarkBG">#BFFAFAFA</Color>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"

Flow.Launcher/Themes/Circle System.xaml

@@ -13,9 +13,9 @@
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
-    <system:String x:Key="BlurMode">Auto</system:String>
+    <system:String x:Key="SystemBG">Auto</system:String>
-    <Color x:Key="lightBG">#BFFAFAFA</Color>
+    <Color x:Key="LightBG">#BFFAFAFA</Color>
-    <Color x:Key="darkBG">#BC202020</Color>
+    <Color x:Key="DarkBG">#BC202020</Color>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"

Flow.Launcher/Themes/Win10System.xaml

@@ -11,6 +11,10 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
+    <system:Boolean x:Key="ThemeBlurEnabled">False</system:Boolean>
+    <system:String x:Key="SystemBG">Auto</system:String>
+    <Color x:Key="LightBG">#FFFAFAFA</Color>
+    <Color x:Key="DarkBG">#FF202020</Color>
     <Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
     <Style
         x:Key="ItemGlyph"

Flow.Launcher/Themes/Win11Light.xaml

@@ -13,10 +13,10 @@
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
-    <system:String x:Key="BlurMode">Auto</system:String>
+    <system:String x:Key="SystemBG">Auto</system:String>
     <system:String x:Key="CornerType">Round</system:String>
-    <Color x:Key="lightBG">#BFFAFAFA</Color>
+    <Color x:Key="LightBG">#BFFAFAFA</Color>
-    <Color x:Key="darkBG">#DD202020</Color>
+    <Color x:Key="DarkBG">#DD202020</Color>
     <Style
         x:Key="BulletStyle"
         BasedOn="{StaticResource BaseBulletStyle}"