Update Growl.cs

This commit is contained in:
NaBian committed 2020-01-07 01:25:25 +08:00
1 parent 1bc5a84959
commit 8bb9e7a02c
1 file changed
+111 -112
@@ -278,7 +278,7 @@ namespace HandyControl.Controls
} }
_tickCount++; _tickCount++;
if (_tickCount >= _waitTime) Close(); if (_tickCount >= _waitTime) Close(true);
}; };
_timerClose.Start(); _timerClose.Start();
} }
@@ -462,6 +462,96 @@ namespace HandyControl.Controls
#endif #endif
} }
private static void InitGrowlInfo(ref GrowlInfo growlInfo, InfoType infoType)
{
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
growlInfo.Type = infoType;
switch (infoType)
{
case InfoType.Success:
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.SuccessGeometry;
growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
}
else
{
growlInfo.IconKey ??= ResourceToken.SuccessGeometry;
growlInfo.IconBrushKey ??= ResourceToken.SuccessBrush;
}
break;
case InfoType.Info:
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.InfoGeometry;
growlInfo.IconBrushKey = ResourceToken.InfoBrush;
}
else
{
growlInfo.IconKey ??= ResourceToken.InfoGeometry;
growlInfo.IconBrushKey ??= ResourceToken.InfoBrush;
}
break;
case InfoType.Warning:
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.WarningGeometry;
growlInfo.IconBrushKey = ResourceToken.WarningBrush;
}
else
{
growlInfo.IconKey ??= ResourceToken.WarningGeometry;
growlInfo.IconBrushKey ??= ResourceToken.WarningBrush;
}
break;
case InfoType.Error:
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.ErrorGeometry;
growlInfo.IconBrushKey = ResourceToken.DangerBrush;
growlInfo.StaysOpen = true;
}
else
{
growlInfo.IconKey ??= ResourceToken.ErrorGeometry;
growlInfo.IconBrushKey ??= ResourceToken.DangerBrush;
}
break;
case InfoType.Fatal:
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.FatalGeometry;
growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
growlInfo.StaysOpen = true;
growlInfo.ShowCloseButton = false;
if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
}
else
{
growlInfo.IconKey ??= ResourceToken.FatalGeometry;
growlInfo.IconBrushKey ??= ResourceToken.PrimaryTextBrush;
}
break;
case InfoType.Ask:
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.AskGeometry;
growlInfo.IconBrushKey = ResourceToken.AccentBrush;
growlInfo.StaysOpen = true;
growlInfo.ShowCloseButton = false;
}
else
{
growlInfo.IconKey ??= ResourceToken.AskGeometry;
growlInfo.IconBrushKey ??= ResourceToken.AccentBrush;
}
break;
default:
throw new ArgumentOutOfRangeException(nameof(infoType), infoType, null);
}
}
/// <summary> /// <summary>
/// 成功 /// 成功
/// </summary> /// </summary>
@@ -479,13 +569,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void Success(GrowlInfo growlInfo) public static void Success(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Success);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.SuccessGeometry;
growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
growlInfo.Type = InfoType.Success;
}
Show(growlInfo); Show(growlInfo);
} }
@@ -504,13 +588,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void SuccessGlobal(GrowlInfo growlInfo) public static void SuccessGlobal(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Success);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.SuccessGeometry;
growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
growlInfo.Type = InfoType.Success;
}
ShowGlobal(growlInfo); ShowGlobal(growlInfo);
} }
@@ -531,13 +609,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void Info(GrowlInfo growlInfo) public static void Info(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Info);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.InfoGeometry;
growlInfo.IconBrushKey = ResourceToken.InfoBrush;
growlInfo.Type = InfoType.Info;
}
Show(growlInfo); Show(growlInfo);
} }
@@ -556,13 +628,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void InfoGlobal(GrowlInfo growlInfo) public static void InfoGlobal(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Info);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.InfoGeometry;
growlInfo.IconBrushKey = ResourceToken.InfoBrush;
growlInfo.Type = InfoType.Info;
}
ShowGlobal(growlInfo); ShowGlobal(growlInfo);
} }
@@ -583,13 +649,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void Warning(GrowlInfo growlInfo) public static void Warning(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Warning);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.WarningGeometry;
growlInfo.IconBrushKey = ResourceToken.WarningBrush;
growlInfo.Type = InfoType.Warning;
}
Show(growlInfo); Show(growlInfo);
} }
@@ -608,13 +668,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void WarningGlobal(GrowlInfo growlInfo) public static void WarningGlobal(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Warning);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.WarningGeometry;
growlInfo.IconBrushKey = ResourceToken.WarningBrush;
growlInfo.Type = InfoType.Warning;
}
ShowGlobal(growlInfo); ShowGlobal(growlInfo);
} }
@@ -635,14 +689,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void Error(GrowlInfo growlInfo) public static void Error(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Error);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.ErrorGeometry;
growlInfo.IconBrushKey = ResourceToken.DangerBrush;
growlInfo.StaysOpen = true;
growlInfo.Type = InfoType.Error;
}
Show(growlInfo); Show(growlInfo);
} }
@@ -661,14 +708,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void ErrorGlobal(GrowlInfo growlInfo) public static void ErrorGlobal(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Error);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.ErrorGeometry;
growlInfo.IconBrushKey = ResourceToken.DangerBrush;
growlInfo.StaysOpen = true;
growlInfo.Type = InfoType.Error;
}
ShowGlobal(growlInfo); ShowGlobal(growlInfo);
} }
@@ -689,16 +729,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void Fatal(GrowlInfo growlInfo) public static void Fatal(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Fatal);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.FatalGeometry;
growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
growlInfo.StaysOpen = true;
growlInfo.ShowCloseButton = false;
growlInfo.Type = InfoType.Fatal;
if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
}
Show(growlInfo); Show(growlInfo);
} }
@@ -717,16 +748,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void FatalGlobal(GrowlInfo growlInfo) public static void FatalGlobal(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Fatal);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.FatalGeometry;
growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
growlInfo.StaysOpen = true;
growlInfo.ShowCloseButton = false;
growlInfo.Type = InfoType.Fatal;
if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
}
ShowGlobal(growlInfo); ShowGlobal(growlInfo);
} }
@@ -749,15 +771,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void Ask(GrowlInfo growlInfo) public static void Ask(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Ask);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.AskGeometry;
growlInfo.IconBrushKey = ResourceToken.AccentBrush;
growlInfo.StaysOpen = true;
growlInfo.ShowCloseButton = false;
growlInfo.Type = InfoType.Ask;
}
Show(growlInfo); Show(growlInfo);
} }
@@ -778,15 +792,7 @@ namespace HandyControl.Controls
/// <param name="growlInfo"></param> /// <param name="growlInfo"></param>
public static void AskGlobal(GrowlInfo growlInfo) public static void AskGlobal(GrowlInfo growlInfo)
{ {
if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); InitGrowlInfo(ref growlInfo, InfoType.Ask);
if (!growlInfo.IsCustom)
{
growlInfo.IconKey = ResourceToken.AskGeometry;
growlInfo.IconBrushKey = ResourceToken.AccentBrush;
growlInfo.StaysOpen = true;
growlInfo.ShowCloseButton = false;
growlInfo.Type = InfoType.Ask;
}
ShowGlobal(growlInfo); ShowGlobal(growlInfo);
} }
@@ -795,8 +801,13 @@ namespace HandyControl.Controls
/// <summary> /// <summary>
/// 关闭 /// 关闭
/// </summary> /// </summary>
private void Close() private void Close(bool invokeActionBeforeClose = false, bool invokeParam = true)
{ {
if (invokeActionBeforeClose)
{
ActionBeforeClose?.Invoke(invokeParam);
}
_timerClose?.Stop(); _timerClose?.Stop();
var transform = new TranslateTransform(); var transform = new TranslateTransform();
_gridMain.RenderTransform = transform; _gridMain.RenderTransform = transform;
@@ -862,20 +873,8 @@ namespace HandyControl.Controls
GrowlWindow = null; GrowlWindow = null;
} }
private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(true, false);
{
if (ActionBeforeClose?.Invoke(false) == true)
{
Close();
}
}
private void ButtonOk_OnClick(object sender, RoutedEventArgs e) private void ButtonOk_OnClick(object sender, RoutedEventArgs e) => Close(true);
{
if (ActionBeforeClose?.Invoke(true) == true)
{
Close();
}
}
} }
} }