From 67219bd62e2896332e9423eda51ad85bc3234851 Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Fri, 1 Feb 2019 19:09:45 +0330 Subject: [PATCH 1/2] Fix MessageBox for null Caption --- HandyControl/Controls/Window/MessageBox.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HandyControl/Controls/Window/MessageBox.cs b/HandyControl/Controls/Window/MessageBox.cs index 9e755973..0ec18acc 100644 --- a/HandyControl/Controls/Window/MessageBox.cs +++ b/HandyControl/Controls/Window/MessageBox.cs @@ -298,7 +298,7 @@ namespace HandyControl.Controls Owner = ownerWindow, WindowStartupLocation = ownerIsNull ? WindowStartupLocation.CenterScreen : WindowStartupLocation.CenterOwner, ShowTitle = true, - Title = caption, + Title = caption ?? System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, Topmost = ownerIsNull, _messageBoxResult = defaultResult }; @@ -388,4 +388,4 @@ namespace HandyControl.Controls || value == MessageBoxResult.Yes; } } -} \ No newline at end of file +} From 1dfa8b084079968312cfb70dcad0a48b9ae1e65c Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Thu, 14 Feb 2019 11:04:41 +0800 Subject: [PATCH 2/2] Update MessageBox.cs --- HandyControl/Controls/Window/MessageBox.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/HandyControl/Controls/Window/MessageBox.cs b/HandyControl/Controls/Window/MessageBox.cs index 0ec18acc..36007596 100644 --- a/HandyControl/Controls/Window/MessageBox.cs +++ b/HandyControl/Controls/Window/MessageBox.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel; -using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Input; @@ -298,7 +297,7 @@ namespace HandyControl.Controls Owner = ownerWindow, WindowStartupLocation = ownerIsNull ? WindowStartupLocation.CenterScreen : WindowStartupLocation.CenterOwner, ShowTitle = true, - Title = caption ?? System.Reflection.Assembly.GetExecutingAssembly().GetName().Name, + Title = caption ?? string.Empty, Topmost = ownerIsNull, _messageBoxResult = defaultResult };