From 5d4bed2d9e4eac45bef18f79993168e0bcdc7186 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 11 Oct 2023 13:41:42 -0400 Subject: [PATCH] Remove unnecessary namespacing --- CHANGELIST.md | 1 + .../CustomMessageBoxWindow.xaml.cs | 36 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index a810e4ebb..c6c9a5166 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -19,6 +19,7 @@ - Fix Check always showing Help text - Version-gate some more newer syntax - Enable path browse button by default +- Remove unnecessary namespacing ### 2.7.0 (2023-10-11) diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs b/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs index b2525f778..2bc87cac2 100644 --- a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs +++ b/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs @@ -137,7 +137,7 @@ internal CustomMessageBoxWindow(Window? owner, string? message, string? caption if (image.HasValue) DisplayImage(image.Value); else - Image_MessageBox.Visibility = System.Windows.Visibility.Collapsed; + Image_MessageBox.Visibility = Visibility.Collapsed; } protected override void OnSourceInitialized(EventArgs e) @@ -154,39 +154,39 @@ private void DisplayButtons(MessageBoxButton button) { case MessageBoxButton.OKCancel: // Hide all but OK, Cancel - Button_OK.Visibility = System.Windows.Visibility.Visible; + Button_OK.Visibility = Visibility.Visible; Button_OK.Focus(); - Button_Cancel.Visibility = System.Windows.Visibility.Visible; + Button_Cancel.Visibility = Visibility.Visible; - Button_Yes.Visibility = System.Windows.Visibility.Collapsed; - Button_No.Visibility = System.Windows.Visibility.Collapsed; + Button_Yes.Visibility = Visibility.Collapsed; + Button_No.Visibility = Visibility.Collapsed; break; case MessageBoxButton.YesNo: // Hide all but Yes, No - Button_Yes.Visibility = System.Windows.Visibility.Visible; + Button_Yes.Visibility = Visibility.Visible; Button_Yes.Focus(); - Button_No.Visibility = System.Windows.Visibility.Visible; + Button_No.Visibility = Visibility.Visible; - Button_OK.Visibility = System.Windows.Visibility.Collapsed; - Button_Cancel.Visibility = System.Windows.Visibility.Collapsed; + Button_OK.Visibility = Visibility.Collapsed; + Button_Cancel.Visibility = Visibility.Collapsed; break; case MessageBoxButton.YesNoCancel: // Hide only OK - Button_Yes.Visibility = System.Windows.Visibility.Visible; + Button_Yes.Visibility = Visibility.Visible; Button_Yes.Focus(); - Button_No.Visibility = System.Windows.Visibility.Visible; - Button_Cancel.Visibility = System.Windows.Visibility.Visible; + Button_No.Visibility = Visibility.Visible; + Button_Cancel.Visibility = Visibility.Visible; - Button_OK.Visibility = System.Windows.Visibility.Collapsed; + Button_OK.Visibility = Visibility.Collapsed; break; default: // Hide all but OK - Button_OK.Visibility = System.Windows.Visibility.Visible; + Button_OK.Visibility = Visibility.Visible; Button_OK.Focus(); - Button_Yes.Visibility = System.Windows.Visibility.Collapsed; - Button_No.Visibility = System.Windows.Visibility.Collapsed; - Button_Cancel.Visibility = System.Windows.Visibility.Collapsed; + Button_Yes.Visibility = Visibility.Collapsed; + Button_No.Visibility = Visibility.Collapsed; + Button_Cancel.Visibility = Visibility.Collapsed; break; } } @@ -215,7 +215,7 @@ private void DisplayImage(MessageBoxImage image) } Image_MessageBox.Source = icon.ToImageSource(); - Image_MessageBox.Visibility = System.Windows.Visibility.Visible; + Image_MessageBox.Visibility = Visibility.Visible; } private void Button_OK_Click(object sender, RoutedEventArgs e)