Fix Shadow Timing

Author: onesounds

Flow.Launcher.Core/Resource/Theme.cs

@@ -153,23 +153,26 @@ public void RefreshFrame()
 
             //Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_BORDER_COLOR, 0x00FF0000);
             //Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3);
-       
-            if (!_settings.UseDropShadowEffect && BlurEnabled)
-            {
-                _settings.UseDropShadowEffect = true;
-                AddDropShadowEffectToCurrentTheme();
-            }
 
-            if (_settings.UseDropShadowEffect)
-            {
-                AddDropShadowEffectToCurrentTheme();
-            }
+            //if (!_settings.UseDropShadowEffect && BlurEnabled)
+            //{
+            //    _settings.UseDropShadowEffect = true;
+            //    AddDropShadowEffectToCurrentTheme();
+            //}
+
+            //if (_settings.UseDropShadowEffect)
+            //{
+            //    AddDropShadowEffectToCurrentTheme();
+            //}
+            //AutoDropShadow();
+            SetBlurForWindow();
+
             //else if (!_settings.usedropshadoweffect && blurenabled)
             //{
             //    adddropshadoweffecttocurrenttheme();
             //    _settings.usedropshadoweffect = true;
             //}
-            SetBlurForWindow();
+
             //SetCornerForWindow();
         }
 
@@ -185,6 +188,7 @@ public void AutoDropShadow()
                 }
                 else
                 {
+                    SetWindowCornerPreference("Default");
                     Debug.WriteLine("이거는 블러없는 테마");
                     AddDropShadowEffectToCurrentTheme();
                 }
@@ -247,6 +251,7 @@ public void SetCornerForWindow()
         /// </summary>
         public void SetBlurForWindow()
         {
+            //AutoDropShadow();
             //SetWindowAccent();
             var dict = GetThemeResourceDictionary(_settings.Theme);
             if (dict == null)
@@ -265,6 +270,7 @@ public void SetBlurForWindow()
                 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, 3);
+                SetWindowCornerPreference("Round");
             }
             else
             {
@@ -274,10 +280,24 @@ public void SetBlurForWindow()
                 //    windowBorderStyle.Setters.Add(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
                 //}
                 Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 1);
+                SetWindowCornerPreference("Default");
+                if (_settings.UseDropShadowEffect)
+                {
+                    
+                    AddDropShadowEffectToCurrentTheme();
+                }
+                else
+                {
+                    RemoveDropShadowEffectFromCurrentTheme();
+                }
 
             }
             ThemeModeColor(BlurMode());
+            
             UpdateResourceDictionary(dict);
+
+            
+
         }
 
         // WindowBorderStyle에서 Background 색상 가져오는 함수
@@ -403,6 +423,7 @@ public void ThemeModeColor(string Mode)
             }
             else
             {
+                //Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, 0);
                 mainWindow.Background = new SolidColorBrush(Colors.Transparent);
             }
         }
@@ -716,14 +737,9 @@ private string GetThemePath(string themeName)
 
         public void AddDropShadowEffectToCurrentTheme()
         {
-            SetWindowCornerPreference("Default");
-            if (BlurEnabled)
-            {
-                SetWindowCornerPreference("Round");
-            }
-            else 
-            { 
-                var dict = GetCurrentResourceDictionary();
+
+            //SetWindowCornerPreference("Default");
+            var dict = GetCurrentResourceDictionary();
 
                 var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
@@ -768,13 +784,12 @@ public void AddDropShadowEffectToCurrentTheme()
                 windowBorderStyle.Setters.Add(effectSetter);
 
                 UpdateResourceDictionary(dict);
-            }
+
         }
 
         public void RemoveDropShadowEffectFromCurrentTheme()
         {
-                SetWindowCornerPreference("Default");
-   
+        
             var dict = GetCurrentResourceDictionary();
             //mainWindow.WindowStyle = WindowStyle.None;
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;

Flow.Launcher/MainWindow.xaml.cs

@@ -67,11 +67,6 @@ public MainWindow(Settings settings, MainViewModel mainVM)
                 var win = HwndSource.FromHwnd(handle);
                 win.AddHook(WndProc);
             };
-            if (_settings.UseDropShadowEffect == false) /* Shadow Effect */
-            {
-                FlowMainWindow.WindowStyle = WindowStyle.None;
-                FlowMainWindow.AllowsTransparency = true;
-            }
         }
 
         DispatcherTimer timer = new DispatcherTimer { Interval = new TimeSpan(0, 0, 0, 0, 500), IsEnabled = false };

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

@@ -38,6 +38,7 @@ public Theme.ThemeData SelectedTheme
             if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect == false)
                 DropShadowEffect = true;
             ThemeManager.Instance.RefreshFrame();
+            //ThemeManager.Instance.SetBlurForWindow();
         }
     }