From 94ef7de8248bd842bea9b7f10898dd157470c6c4 Mon Sep 17 00:00:00 2001 From: GF-Huang Date: Thu, 10 Jun 2021 21:25:33 +0800 Subject: [PATCH] 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); /// /// 关闭 /// - 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); }