This commit is contained in:
NaBian committed 2025-09-14 12:50:54 +08:00
1 parent edd21ffddf
commit 55d7d983e9
1 file changed
+6 -23
@@ -1,5 +1,4 @@
using System; using System;
using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Documents; using System.Windows.Documents;
@@ -287,13 +286,7 @@ public class Growl : Control
var menuItem = new MenuItem(); var menuItem = new MenuItem();
LangProvider.SetLang(menuItem, HeaderedItemsControl.HeaderProperty, LangKeys.Clear); LangProvider.SetLang(menuItem, HeaderedItemsControl.HeaderProperty, LangKeys.Clear);
menuItem.Click += (s, e) => menuItem.Click += (s, e) => Clear(panel);
{
foreach (var item in panel.Children.OfType<Growl>())
{
item.Close(invokeParam: false, isClear: true);
}
};
panel.ContextMenu = new ContextMenu panel.ContextMenu = new ContextMenu
{ {
Items = Items =
@@ -439,21 +432,11 @@ public class Growl : Control
private static Panel CreateDefaultPanel() private static Panel CreateDefaultPanel()
{ {
var win = WindowHelper.GetActiveWindow(); var window = WindowHelper.GetActiveWindow();
win.Closed+= (s, e) => window.Closed += (s, e) => Clear(GrowlPanel);
{ var decorator = VisualHelper.GetChild<AdornerDecorator>(window);
if (GrowlPanel != null)
{
foreach (var item in GrowlPanel.Children.OfType<Growl>())
{
item.Close(false);
}
GrowlPanel = null;
}
};
var decorator = VisualHelper.GetChild<AdornerDecorator>(win);
var layer = decorator?.AdornerLayer; var layer = decorator?.AdornerLayer;
if (layer == null) if (layer == null)
{ {
return null; return null;
@@ -1068,7 +1051,7 @@ public class Growl : Control
TransitionMode.Custom) TransitionMode.Custom)
{ {
return null; return null;
} }
var animation = AnimationHelper.CreateAnimation(isClose ? 0 : 1); var animation = AnimationHelper.CreateAnimation(isClose ? 0 : 1);
animation.From = isClose ? 1 : 0; animation.From = isClose ? 1 : 0;