From 4872b8e25c04262985864505a167e83c4a23fdd3 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 21 Oct 2019 22:06:56 +0800
Subject: [PATCH] fixed a bug of MessageBox

---
 .../UserControl/Controls/WindowDemoCtl.xaml.cs              | 4 ++--
 .../HandyControl_Shared/Controls/Window/MessageBox.cs       | 6 +++---
 src/Shared/HandyControl_Shared/Data/MessageBoxInfo.cs       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
index 0fee133f..b10b0577 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
@@ -23,12 +23,12 @@ namespace HandyControlDemo.UserControl
         {
             MessageBox.Show(new MessageBoxInfo
             {
-                MessageBoxText = Properties.Langs.Lang.GrowlAsk,
+                Message = Properties.Langs.Lang.GrowlAsk,
                 Caption = Properties.Langs.Lang.Title,
                 Button = MessageBoxButton.YesNo,
                 IconBrushKey = ResourceToken.AccentBrush,
                 IconKey = ResourceToken.AskGeometry,
-                Style = ResourceHelper.GetResource<Style>("MessageBoxCustom")
+                StyleKey = "MessageBoxCustom"
             });
         }
 
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index 62f0c676..1463b2f5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -267,7 +267,7 @@ namespace HandyControl.Controls
             MessageBox messageBox = null;
             Application.Current.Dispatcher.Invoke(new Action(() =>
             {
-                messageBox = CreateMessageBox(null, info.MessageBoxText, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
+                messageBox = CreateMessageBox(null, info.Message, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
                 SetButtonStatus(messageBox, info.Button);
 
                 if (!string.IsNullOrEmpty(info.IconKey))
@@ -277,9 +277,9 @@ namespace HandyControl.Controls
                     messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey);
                 }
 
-                if (info.Style != null)
+                if (info.StyleKey != null)
                 {
-                    messageBox.Style = info.Style;
+                    messageBox.Style = ResourceHelper.GetResource<Style>(info.StyleKey);
                 }
                 SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
diff --git a/src/Shared/HandyControl_Shared/Data/MessageBoxInfo.cs b/src/Shared/HandyControl_Shared/Data/MessageBoxInfo.cs
index f79ace63..44791f97 100644
--- a/src/Shared/HandyControl_Shared/Data/MessageBoxInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/MessageBoxInfo.cs
@@ -4,7 +4,7 @@ namespace HandyControl.Data
 {
     public class MessageBoxInfo
     {
-        public string MessageBoxText { get; set; }
+        public string Message { get; set; }
 
         public string Caption { get; set; }
 
@@ -16,6 +16,6 @@ namespace HandyControl.Data
 
         public MessageBoxResult DefaultResult { get; set; } = MessageBoxResult.None;
 
-        public Style Style { get; set; }
+        public string StyleKey { get; set; }
     }
 }
\ No newline at end of file