Skip to content

Commit 55d7d98

Browse files
committed
fix: #1735
1 parent edd21ff commit 55d7d98

File tree

1 file changed

+6
-23
lines changed
  • src/Shared/HandyControl_Shared/Controls/Growl

1 file changed

+6
-23
lines changed

src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Linq;
32
using System.Windows;
43
using System.Windows.Controls;
54
using System.Windows.Documents;
@@ -287,13 +286,7 @@ private static void InitGrowlPanel(Panel panel)
287286
var menuItem = new MenuItem();
288287
LangProvider.SetLang(menuItem, HeaderedItemsControl.HeaderProperty, LangKeys.Clear);
289288

290-
menuItem.Click += (s, e) =>
291-
{
292-
foreach (var item in panel.Children.OfType<Growl>())
293-
{
294-
item.Close(invokeParam: false, isClear: true);
295-
}
296-
};
289+
menuItem.Click += (s, e) => Clear(panel);
297290
panel.ContextMenu = new ContextMenu
298291
{
299292
Items =
@@ -439,21 +432,11 @@ private static void Show(GrowlInfo growlInfo)
439432

440433
private static Panel CreateDefaultPanel()
441434
{
442-
var win = WindowHelper.GetActiveWindow();
443-
win.Closed+= (s, e) =>
444-
{
445-
if (GrowlPanel != null)
446-
{
447-
foreach (var item in GrowlPanel.Children.OfType<Growl>())
448-
{
449-
item.Close(false);
450-
}
451-
GrowlPanel = null;
452-
}
453-
};
454-
var decorator = VisualHelper.GetChild<AdornerDecorator>(win);
455-
435+
var window = WindowHelper.GetActiveWindow();
436+
window.Closed += (s, e) => Clear(GrowlPanel);
437+
var decorator = VisualHelper.GetChild<AdornerDecorator>(window);
456438
var layer = decorator?.AdornerLayer;
439+
457440
if (layer == null)
458441
{
459442
return null;
@@ -1068,7 +1051,7 @@ TransitionMode.Top2Bottom or
10681051
TransitionMode.Custom)
10691052
{
10701053
return null;
1071-
}
1054+
}
10721055

10731056
var animation = AnimationHelper.CreateAnimation(isClose ? 0 : 1);
10741057
animation.From = isClose ? 1 : 0;

0 commit comments

Comments
 (0)