From efb4e6bda2b9b46bf82632c2339bcea61e3f70ce Mon Sep 17 00:00:00 2001
From: "github-actions-dotnet-formatter[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Aug 2026 00:32:36 +0000
Subject: [PATCH] Automated dotnet-format update
---
.../Controls/Block/ToggleBlock.cs | 2 +-
.../Controls/Growl/GrowlWindow.cs | 2 +-
.../Controls/Window/MessageBox.cs | 1126 ++++++++---------
3 files changed, 565 insertions(+), 565 deletions(-)
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
index 0f6ec4236..d48b84ef5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
@@ -68,7 +68,7 @@ public ToggleBlock()
//CommandBindings.Add(new CommandBinding(ControlCommands.Toggle, OnToggled));
OnToggleGestureChanged(ToggleGesture);
-
+
//Unloaded += OnUnloaded;
}
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
index 6e1751da4..2b359f046 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
@@ -16,7 +16,7 @@ internal GrowlWindow()
{
WindowStyle = WindowStyle.None;
AllowsTransparency = true;
-
+
GrowlPanel = new StackPanel
{
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index c15ef86df..30a21b3d1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -15,665 +15,665 @@
namespace HandyControl.Controls;
- ///
- /// 消息框
- ///
- [SuppressMessage("ReSharper", "RedundantDelegateCreation")]
- [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
- [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
+///
+/// 消息框
+///
+[SuppressMessage("ReSharper", "RedundantDelegateCreation")]
+[TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+[TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
- public sealed class MessageBox : Window
- {
- private const string ElementPanel = "PART_Panel";
+public sealed class MessageBox : Window
+{
+ private const string ElementPanel = "PART_Panel";
- private const string ElementButtonClose = "PART_ButtonClose";
+ private const string ElementButtonClose = "PART_ButtonClose";
- private Button _buttonClose;
+ private Button _buttonClose;
- private Panel _panel;
+ private Panel _panel;
- private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
+ private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
- private Button _buttonOk;
+ private Button _buttonOk;
- private Button _buttonCancel;
+ private Button _buttonCancel;
- private Button _buttonYes;
+ private Button _buttonYes;
- private Button _buttonNo;
+ private Button _buttonNo;
- private bool _showOk;
+ private bool _showOk;
- private bool _showCancel;
+ private bool _showCancel;
- private bool _showYes;
+ private bool _showYes;
- private bool _showNo;
+ private bool _showNo;
- private IntPtr _lastActiveWindowIntPtr;
+ private IntPtr _lastActiveWindowIntPtr;
- public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
- nameof(Message), typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
+ public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
+ nameof(Message), typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
- public string Message
- {
- get => (string) GetValue(MessageProperty);
- set => SetValue(MessageProperty, value);
- }
+ public string Message
+ {
+ get => (string) GetValue(MessageProperty);
+ set => SetValue(MessageProperty, value);
+ }
- public static readonly DependencyProperty ImageProperty = DependencyProperty.Register(
- nameof(Image), typeof(Geometry), typeof(MessageBox), new PropertyMetadata(default(Geometry)));
+ public static readonly DependencyProperty ImageProperty = DependencyProperty.Register(
+ nameof(Image), typeof(Geometry), typeof(MessageBox), new PropertyMetadata(default(Geometry)));
- public Geometry Image
- {
- get => (Geometry) GetValue(ImageProperty);
- set => SetValue(ImageProperty, value);
- }
+ public Geometry Image
+ {
+ get => (Geometry) GetValue(ImageProperty);
+ set => SetValue(ImageProperty, value);
+ }
- public static readonly DependencyProperty ImageBrushProperty = DependencyProperty.Register(
- nameof(ImageBrush), typeof(Brush), typeof(MessageBox), new PropertyMetadata(default(Brush)));
+ public static readonly DependencyProperty ImageBrushProperty = DependencyProperty.Register(
+ nameof(ImageBrush), typeof(Brush), typeof(MessageBox), new PropertyMetadata(default(Brush)));
- public Brush ImageBrush
- {
- get => (Brush) GetValue(ImageBrushProperty);
- set => SetValue(ImageBrushProperty, value);
- }
+ public Brush ImageBrush
+ {
+ get => (Brush) GetValue(ImageBrushProperty);
+ set => SetValue(ImageBrushProperty, value);
+ }
- public static readonly DependencyProperty ShowImageProperty = DependencyProperty.Register(
- nameof(ShowImage), typeof(bool), typeof(MessageBox), new PropertyMetadata(ValueBoxes.FalseBox));
+ public static readonly DependencyProperty ShowImageProperty = DependencyProperty.Register(
+ nameof(ShowImage), typeof(bool), typeof(MessageBox), new PropertyMetadata(ValueBoxes.FalseBox));
- public bool ShowImage
- {
- get => (bool) GetValue(ShowImageProperty);
- set => SetValue(ShowImageProperty, ValueBoxes.BooleanBox(value));
- }
+ public bool ShowImage
+ {
+ get => (bool) GetValue(ShowImageProperty);
+ set => SetValue(ShowImageProperty, ValueBoxes.BooleanBox(value));
+ }
- private MessageBox()
+ private MessageBox()
+ {
+ CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
{
- CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
- {
- _messageBoxResult = MessageBoxResult.OK;
- Close();
- }, (s, e) => e.CanExecute = _showOk));
- CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
- {
- _messageBoxResult = MessageBoxResult.Cancel;
- Close();
- }, (s, e) => e.CanExecute = _showCancel));
- CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
- {
- _messageBoxResult = MessageBoxResult.Yes;
- Close();
- }, (s, e) => e.CanExecute = _showYes));
- CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
- {
- _messageBoxResult = MessageBoxResult.No;
- Close();
- }, (s, e) => e.CanExecute = _showNo));
- }
+ _messageBoxResult = MessageBoxResult.OK;
+ Close();
+ }, (s, e) => e.CanExecute = _showOk));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
+ {
+ _messageBoxResult = MessageBoxResult.Cancel;
+ Close();
+ }, (s, e) => e.CanExecute = _showCancel));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
+ {
+ _messageBoxResult = MessageBoxResult.Yes;
+ Close();
+ }, (s, e) => e.CanExecute = _showYes));
+ CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
+ {
+ _messageBoxResult = MessageBoxResult.No;
+ Close();
+ }, (s, e) => e.CanExecute = _showNo));
+ }
- protected override void OnSourceInitialized(EventArgs e)
+ protected override void OnSourceInitialized(EventArgs e)
+ {
+ if (_showYes && !_showCancel)
{
- if (_showYes && !_showCancel)
+ var hMenu = InteropMethods.GetSystemMenu(this.GetHandle(), false);
+ if (hMenu != IntPtr.Zero)
{
- var hMenu = InteropMethods.GetSystemMenu(this.GetHandle(), false);
- if (hMenu != IntPtr.Zero)
- {
- InteropMethods.EnableMenuItem(hMenu, InteropValues.SC_CLOSE, InteropValues.MF_BYCOMMAND | InteropValues.MF_GRAYED);
- }
-
- if (_buttonClose != null)
- {
- _buttonClose.IsEnabled = false;
- }
+ InteropMethods.EnableMenuItem(hMenu, InteropValues.SC_CLOSE, InteropValues.MF_BYCOMMAND | InteropValues.MF_GRAYED);
}
- base.OnSourceInitialized(e);
-
- _lastActiveWindowIntPtr = InteropMethods.GetForegroundWindow();
- Activate();
+ if (_buttonClose != null)
+ {
+ _buttonClose.IsEnabled = false;
+ }
}
- protected override void OnClosed(EventArgs e)
- {
- // 这里不能恢复焦点,会造成切换窗口后焦点混乱。
- //InteropMethods.SetForegroundWindow(_lastActiveWindowIntPtr);
+ base.OnSourceInitialized(e);
- base.OnClosed(e);
- }
+ _lastActiveWindowIntPtr = InteropMethods.GetForegroundWindow();
+ Activate();
+ }
- public override void OnApplyTemplate()
- {
- base.OnApplyTemplate();
+ protected override void OnClosed(EventArgs e)
+ {
+ // 这里不能恢复焦点,会造成切换窗口后焦点混乱。
+ //InteropMethods.SetForegroundWindow(_lastActiveWindowIntPtr);
- _panel = GetTemplateChild(ElementPanel) as Panel;
- if (_panel != null)
- {
- if (_buttonOk != null)
- {
- _panel.Children.Add(_buttonOk);
- }
+ base.OnClosed(e);
+ }
- if (_buttonYes != null)
- {
- _panel.Children.Add(_buttonYes);
- }
+ public override void OnApplyTemplate()
+ {
+ base.OnApplyTemplate();
- if (_buttonNo != null)
- {
- _panel.Children.Add(_buttonNo);
- }
+ _panel = GetTemplateChild(ElementPanel) as Panel;
+ if (_panel != null)
+ {
+ if (_buttonOk != null)
+ {
+ _panel.Children.Add(_buttonOk);
+ }
- if (_buttonCancel != null)
- {
- _panel.Children.Add(_buttonCancel);
- }
+ if (_buttonYes != null)
+ {
+ _panel.Children.Add(_buttonYes);
+ }
- // 按钮创建时不在视觉树里,RoutedCommand 找不到窗口上的 CommandBinding,
- // IsEnabled 为 false,样式又把 Visibility 绑到 IsEnabled,导致首帧不显示按钮、
- // 等 CommandManager 异步重查后才出现(晚一拍)。进树后同步重查一次,保证首帧就绘出按钮。
- RefreshCommandState(_buttonOk);
- RefreshCommandState(_buttonYes);
- RefreshCommandState(_buttonNo);
- RefreshCommandState(_buttonCancel);
+ if (_buttonNo != null)
+ {
+ _panel.Children.Add(_buttonNo);
}
- _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
- if (_buttonClose != null)
+ if (_buttonCancel != null)
{
- _buttonClose.Click += ButtonClose_Click;
+ _panel.Children.Add(_buttonCancel);
}
+
+ // 按钮创建时不在视觉树里,RoutedCommand 找不到窗口上的 CommandBinding,
+ // IsEnabled 为 false,样式又把 Visibility 绑到 IsEnabled,导致首帧不显示按钮、
+ // 等 CommandManager 异步重查后才出现(晚一拍)。进树后同步重查一次,保证首帧就绘出按钮。
+ RefreshCommandState(_buttonOk);
+ RefreshCommandState(_buttonYes);
+ RefreshCommandState(_buttonNo);
+ RefreshCommandState(_buttonCancel);
}
- private void ButtonClose_Click(object sender, RoutedEventArgs e) => Close();
+ _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
+ if (_buttonClose != null)
+ {
+ _buttonClose.Click += ButtonClose_Click;
+ }
+ }
+
+ private void ButtonClose_Click(object sender, RoutedEventArgs e) => Close();
- private static void RefreshCommandState(Button button)
+ private static void RefreshCommandState(Button button)
+ {
+ if (button?.Command == null)
{
- if (button?.Command == null)
- {
- return;
- }
+ return;
+ }
- // 重设 Command 触发 ButtonBase.UpdateCanExecute,立即以按钮当前所在的树重新求值 CanExecute。
- var command = button.Command;
- button.Command = null;
- button.Command = command;
+ // 重设 Command 触发 ButtonBase.UpdateCanExecute,立即以按钮当前所在的树重新求值 CanExecute。
+ var command = button.Command;
+ button.Command = null;
+ button.Command = command;
+ }
+
+ protected override void OnPreviewKeyDown(KeyEventArgs e)
+ {
+ if (e.Key == Key.System && e.SystemKey == Key.F4)
+ {
+ e.Handled = true;
+ return;
}
- protected override void OnPreviewKeyDown(KeyEventArgs e)
+ if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.C)
{
- if (e.Key == Key.System && e.SystemKey == Key.F4)
+ var builder = new StringBuilder();
+ var line = new string('-', 27);
+ builder.Append(line);
+ builder.Append(Environment.NewLine);
+ builder.Append(Title);
+ builder.Append(Environment.NewLine);
+ builder.Append(line);
+ builder.Append(Environment.NewLine);
+ builder.Append(Message);
+ builder.Append(Environment.NewLine);
+ builder.Append(line);
+ builder.Append(Environment.NewLine);
+ if (_showOk)
{
- e.Handled = true;
- return;
+ builder.Append(Lang.Confirm);
+ builder.Append(" ");
}
-
- if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.C)
+ if (_showYes)
{
- var builder = new StringBuilder();
- var line = new string('-', 27);
- builder.Append(line);
- builder.Append(Environment.NewLine);
- builder.Append(Title);
- builder.Append(Environment.NewLine);
- builder.Append(line);
- builder.Append(Environment.NewLine);
- builder.Append(Message);
- builder.Append(Environment.NewLine);
- builder.Append(line);
- builder.Append(Environment.NewLine);
- if (_showOk)
- {
- builder.Append(Lang.Confirm);
- builder.Append(" ");
- }
- if (_showYes)
- {
- builder.Append(Lang.Yes);
- builder.Append(" ");
- }
- if (_showNo)
- {
- builder.Append(Lang.No);
- builder.Append(" ");
- }
- if (_showCancel)
- {
- builder.Append(Lang.Cancel);
- builder.Append(" ");
- }
- builder.Append(Environment.NewLine);
- builder.Append(line);
- builder.Append(Environment.NewLine);
+ builder.Append(Lang.Yes);
+ builder.Append(" ");
+ }
+ if (_showNo)
+ {
+ builder.Append(Lang.No);
+ builder.Append(" ");
+ }
+ if (_showCancel)
+ {
+ builder.Append(Lang.Cancel);
+ builder.Append(" ");
+ }
+ builder.Append(Environment.NewLine);
+ builder.Append(line);
+ builder.Append(Environment.NewLine);
- try
- {
- Clipboard.SetDataObject(builder.ToString());
- }
- catch
- {
- // ignored
- }
+ try
+ {
+ Clipboard.SetDataObject(builder.ToString());
+ }
+ catch
+ {
+ // ignored
}
}
+ }
- ///
- /// 成功
- ///
- ///
- ///
- public static MessageBoxResult Success(string messageBoxText, string caption = null)
+ ///
+ /// 成功
+ ///
+ ///
+ ///
+ public static MessageBoxResult Success(string messageBoxText, string caption = null)
+ {
+ MessageBox messageBox = null;
+ Application.Current.Dispatcher.Invoke(new Action(() =>
{
- MessageBox messageBox = null;
- Application.Current.Dispatcher.Invoke(new Action(() =>
- {
- messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
- SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
- messageBox.ShowImage = true;
- messageBox.Image = ResourceHelper.GetResourceInternal(ResourceToken.SuccessGeometry);
- messageBox.ImageBrush = ResourceHelper.GetResourceInternal(ResourceToken.SuccessBrush);
- SystemSounds.Asterisk.Play();
- messageBox.ShowDialog();
- }));
+ messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+ SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+ messageBox.ShowImage = true;
+ messageBox.Image = ResourceHelper.GetResourceInternal(ResourceToken.SuccessGeometry);
+ messageBox.ImageBrush = ResourceHelper.GetResourceInternal(ResourceToken.SuccessBrush);
+ SystemSounds.Asterisk.Play();
+ messageBox.ShowDialog();
+ }));
- return messageBox._messageBoxResult;
- }
+ return messageBox._messageBoxResult;
+ }
- ///
- /// 消息
- ///
- ///
- ///
- public static MessageBoxResult Info(string messageBoxText, string caption = null)
+ ///
+ /// 消息
+ ///
+ ///
+ ///
+ public static MessageBoxResult Info(string messageBoxText, string caption = null)
+ {
+ MessageBox messageBox = null;
+ Application.Current.Dispatcher.Invoke(new Action(() =>
{
- MessageBox messageBox = null;
- Application.Current.Dispatcher.Invoke(new Action(() =>
- {
- messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
- SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
- SetImage(messageBox, MessageBoxImage.Information);
- SystemSounds.Asterisk.Play();
- messageBox.ShowDialog();
- }));
-
- return messageBox._messageBoxResult;
- }
+ messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
+ SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+ SetImage(messageBox, MessageBoxImage.Information);
+ SystemSounds.Asterisk.Play();
+ messageBox.ShowDialog();
+ }));
+
+ return messageBox._messageBoxResult;
+ }
- ///
- /// 警告
- ///
- ///
- ///
- public static MessageBoxResult Warning(string messageBoxText, string caption = null)
+ ///
+ /// 警告
+ ///
+ ///
+ ///
+ public static MessageBoxResult Warning(string messageBoxText, string caption = null)
+ {
+ MessageBox messageBox = null;
+ Application.Current.Dispatcher.Invoke(new Action(() =>
{
- MessageBox messageBox = null;
- Application.Current.Dispatcher.Invoke(new Action(() =>
- {
- messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
- SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
- SetImage(messageBox, MessageBoxImage.Warning);
- SystemSounds.Asterisk.Play();
- messageBox.ShowDialog();
- }));
-
- return messageBox._messageBoxResult;
- }
+ messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
+ SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+ SetImage(messageBox, MessageBoxImage.Warning);
+ SystemSounds.Asterisk.Play();
+ messageBox.ShowDialog();
+ }));
+
+ return messageBox._messageBoxResult;
+ }
- ///
- /// 错误
- ///
- ///
- ///
- public static MessageBoxResult Error(string messageBoxText, string caption = null)
+ ///
+ /// 错误
+ ///
+ ///
+ ///
+ public static MessageBoxResult Error(string messageBoxText, string caption = null)
+ {
+ MessageBox messageBox = null;
+ Application.Current.Dispatcher.Invoke(new Action(() =>
{
- MessageBox messageBox = null;
- Application.Current.Dispatcher.Invoke(new Action(() =>
- {
- messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
- SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
- SetImage(messageBox, MessageBoxImage.Error);
- SystemSounds.Asterisk.Play();
- messageBox.ShowDialog();
- }));
-
- return messageBox._messageBoxResult;
- }
+ messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
+ SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+ SetImage(messageBox, MessageBoxImage.Error);
+ SystemSounds.Asterisk.Play();
+ messageBox.ShowDialog();
+ }));
+
+ return messageBox._messageBoxResult;
+ }
- ///
- /// 严重
- ///
- ///
- ///
- public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
+ ///
+ /// 严重
+ ///
+ ///
+ ///
+ public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
+ {
+ MessageBox messageBox = null;
+ Application.Current.Dispatcher.Invoke(new Action(() =>
{
- MessageBox messageBox = null;
- Application.Current.Dispatcher.Invoke(new Action(() =>
- {
- messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
- SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
- messageBox.ShowImage = true;
- messageBox.Image = ResourceHelper.GetResourceInternal(ResourceToken.FatalGeometry);
- messageBox.ImageBrush = ResourceHelper.GetResourceInternal(ResourceToken.PrimaryTextBrush);
- SystemSounds.Asterisk.Play();
- messageBox.ShowDialog();
- }));
+ messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+ SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+ messageBox.ShowImage = true;
+ messageBox.Image = ResourceHelper.GetResourceInternal(ResourceToken.FatalGeometry);
+ messageBox.ImageBrush = ResourceHelper.GetResourceInternal(ResourceToken.PrimaryTextBrush);
+ SystemSounds.Asterisk.Play();
+ messageBox.ShowDialog();
+ }));
- return messageBox._messageBoxResult;
- }
+ return messageBox._messageBoxResult;
+ }
- ///
- /// 询问
- ///
- ///
- ///
- public static MessageBoxResult Ask(string messageBoxText, string caption = null)
+ ///
+ /// 询问
+ ///
+ ///
+ ///
+ public static MessageBoxResult Ask(string messageBoxText, string caption = null)
+ {
+ MessageBox messageBox = null;
+ Application.Current.Dispatcher.Invoke(new Action(() =>
{
- MessageBox messageBox = null;
- Application.Current.Dispatcher.Invoke(new Action(() =>
- {
- messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
- SetButtonStatus(messageBox, MessageBoxButton.OKCancel, MessageBoxResult.Cancel);
- SetImage(messageBox, MessageBoxImage.Question);
- SystemSounds.Asterisk.Play();
- messageBox.ShowDialog();
- }));
-
- return messageBox._messageBoxResult;
- }
+ messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
+ SetButtonStatus(messageBox, MessageBoxButton.OKCancel, MessageBoxResult.Cancel);
+ SetImage(messageBox, MessageBoxImage.Question);
+ SystemSounds.Asterisk.Play();
+ messageBox.ShowDialog();
+ }));
+
+ return messageBox._messageBoxResult;
+ }
- ///
- /// 自定义信息展示
- ///
- ///
- ///
- public static MessageBoxResult Show(MessageBoxInfo info)
+ ///
+ /// 自定义信息展示
+ ///
+ ///
+ ///
+ public static MessageBoxResult Show(MessageBoxInfo info)
+ {
+ MessageBox messageBox = null;
+ Application.Current.Dispatcher.Invoke(new Action(() =>
{
- MessageBox messageBox = null;
- Application.Current.Dispatcher.Invoke(new Action(() =>
+ messageBox = CreateMessageBox(null, info.Message, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
+ SetButtonStatus(messageBox, info.Button, info.DefaultResult);
+
+ if (!string.IsNullOrEmpty(info.IconKey))
{
- messageBox = CreateMessageBox(null, info.Message, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
- SetButtonStatus(messageBox, info.Button, info.DefaultResult);
+ messageBox.ShowImage = true;
+ messageBox.Image = ResourceHelper.GetResource(info.IconKey) ?? info.Icon;
+ messageBox.ImageBrush = ResourceHelper.GetResource(info.IconBrushKey) ?? info.IconBrush;
+ }
- if (!string.IsNullOrEmpty(info.IconKey))
- {
- messageBox.ShowImage = true;
- messageBox.Image = ResourceHelper.GetResource(info.IconKey) ?? info.Icon;
- messageBox.ImageBrush = ResourceHelper.GetResource(info.IconBrushKey) ?? info.IconBrush;
- }
+ if (info.StyleKey != null)
+ {
+ messageBox.Style = ResourceHelper.GetResource