diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs index 5aca4c9d9..39aa2d6f4 100644 --- a/Flow.Launcher.Core/Resource/Theme.cs +++ b/Flow.Launcher.Core/Resource/Theme.cs @@ -153,7 +153,6 @@ namespace Flow.Launcher.Core.Resource //Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_BORDER_COLOR, 0x00FF0000); //Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3); - ThemeModeColor(BlurMode()); SetBlurForWindow(); SetCornerForWindow(); } @@ -197,12 +196,11 @@ namespace Flow.Launcher.Core.Resource var windowBorderStyle = dict["WindowBorderStyle"] as Style; if (windowBorderStyle == null) return; - Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3); + //Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3); if (BlurEnabled) { //mainWindow.WindowStyle = WindowStyle.SingleBorderWindow; //BlurColor(BlurMode()); - ThemeModeColor(BlurMode()); Debug.WriteLine("~~~~~~~~~~~~~~~~~~~~"); Debug.WriteLine(BlurMode()); windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType().FirstOrDefault(x => x.Property.Name == "Background")); @@ -219,6 +217,7 @@ namespace Flow.Launcher.Core.Resource Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 1); } + ThemeModeColor(BlurMode()); UpdateResourceDictionary(dict); } @@ -343,6 +342,10 @@ namespace Flow.Launcher.Core.Resource Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0); return; } + else + { + mainWindow.Background = new SolidColorBrush(Colors.Transparent); + } } public void BlurColor(string Color) { diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 7ffd5e3e3..cd6dda39d 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -190,7 +190,6 @@ namespace Flow.Launcher { ThemeManager.Instance.RefreshFrame(); }), DispatcherPriority.Background); - // MouseEventHandler PreviewMouseMove += MainPreviewMouseMove; CheckFirstLaunch(); diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index c5acd7313..b96cb661e 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -93,7 +93,7 @@ - + diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml index d6f9813d0..a8b04d640 100644 --- a/Flow.Launcher/Themes/Pink.xaml +++ b/Flow.Launcher/Themes/Pink.xaml @@ -1,7 +1,15 @@ - + + True + Light + RoundSmall + #DDFEC7D7 + #DDFEC7D7 0 0 0 0