From 94ef7de8248bd842bea9b7f10898dd157470c6c4 Mon Sep 17 00:00:00 2001
From: GF-Huang <GF-Huang@users.noreply.github.com>
Date: Thu, 10 Jun 2021 21:25:33 +0800
Subject: [PATCH 1/2] Growl should always call ActionBeforeClose if user
 provided.

---
 .../HandyControl_Shared/Controls/Growl/Growl.cs       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
index e24d5913..6b182155 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
@@ -830,17 +830,14 @@ namespace HandyControl.Controls
             ShowGlobal(growlInfo);
         }
 
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close(true, false);
+        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close(invokeParam: false);
 
         /// <summary>
         ///     关闭
         /// </summary>
-        private void Close(bool invokeActionBeforeClose = false, bool invokeParam = true)
+        private void Close(bool invokeParam = true)
         {
-            if (invokeActionBeforeClose)
-            {
-                if (ActionBeforeClose?.Invoke(invokeParam) == false) return;
-            }
+            if (ActionBeforeClose?.Invoke(invokeParam) == false) return;
 
             _timerClose?.Stop();
             var transform = new TranslateTransform();
@@ -910,7 +907,7 @@ namespace HandyControl.Controls
             GrowlWindow = null;
         }
 
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(true, false);
+        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(invokeParam: false);
 
         private void ButtonOk_OnClick(object sender, RoutedEventArgs e) => Close(true);
     }

From 3d94d93780334b1afb3b38b0c82cc25b901fa586 Mon Sep 17 00:00:00 2001
From: chenjie02_cd <836904362@qq.com>
Date: Sat, 10 Jul 2021 20:41:52 +0800
Subject: [PATCH 2/2] formatted code

---
 .../Controls/Growl/Growl.cs                    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
index 6b182155..11dedf7f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
@@ -291,7 +291,10 @@ namespace HandyControl.Controls
                 }
 
                 _tickCount++;
-                if (_tickCount >= _waitTime) Close(true);
+                if (_tickCount >= _waitTime)
+                {
+                    Close(true);
+                }
             };
             _timerClose.Start();
         }
@@ -317,7 +320,7 @@ namespace HandyControl.Controls
             {
                 foreach (var item in panel.Children.OfType<Growl>())
                 {
-                    item.Close();
+                    item.Close(false);
                 }
             };
             panel.ContextMenu = new ContextMenu
@@ -830,14 +833,17 @@ namespace HandyControl.Controls
             ShowGlobal(growlInfo);
         }
 
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close(invokeParam: false);
+        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close(false);
 
         /// <summary>
         ///     关闭
         /// </summary>
-        private void Close(bool invokeParam = true)
+        private void Close(bool invokeParam)
         {
-            if (ActionBeforeClose?.Invoke(invokeParam) == false) return;
+            if (ActionBeforeClose?.Invoke(invokeParam) == false)
+            {
+                return;
+            }
 
             _timerClose?.Stop();
             var transform = new TranslateTransform();
@@ -907,7 +913,7 @@ namespace HandyControl.Controls
             GrowlWindow = null;
         }
 
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(invokeParam: false);
+        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(false);
 
         private void ButtonOk_OnClick(object sender, RoutedEventArgs e) => Close(true);
     }