Extract out default close result in MessageBoxEx and use when dialog closed outside of response buttons

Author: DavidGBrett

Flow.Launcher/MessageBoxEx.xaml.cs

@@ -57,6 +57,11 @@ public static MessageBoxResult Show(
                     _ = SetImageOfMessageBoxAsync(icon);
                 }
                 SetButtonVisibilityFocusAndResult(button, defaultResult);
+
+                // This ensures that if the message box is closed without using the answer buttons
+                // It will still have a meaningful result based on its type
+                _result = msgBox.DefaultCloseResult;
+
                 msgBox.ShowDialog();
                 return _result;
             }
@@ -163,15 +168,30 @@ private async Task SetImageAsync(string imageName)
             Img.Source = imageSource;
         }
 
+        // What the result should be if the message box is closed outside of the direct response buttons - e.g title bar close button
+        // Mostly replicates System.Windows.MessageBox behavior
+        // https://learn.microsoft.com/en-us/dotnet/api/system.windows.messageboxresult#remarks
+        private MessageBoxResult DefaultCloseResult => _button switch
+        {
+            MessageBoxButton.OK => MessageBoxResult.OK,
+            MessageBoxButton.OKCancel => MessageBoxResult.Cancel,
+            MessageBoxButton.YesNoCancel => MessageBoxResult.Cancel,
+            
+            // For YesNo this should only be used in a forced close edge case (e.g. alt f4)
+            // Most callers make the mistake of checking for No instead of not Yes - so best not to return None etc
+            MessageBoxButton.YesNo => MessageBoxResult.No,
+            
+            // covers unsupported types, e.g. AbortRetryIgnore
+            _ => MessageBoxResult.None 
+        };
+
+
         private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
         {
             if (_button == MessageBoxButton.YesNo)
                 // Follow System.Windows.MessageBox behavior
                 return;
-            else if (_button == MessageBoxButton.OK)
-                _result = MessageBoxResult.OK;
-            else
-                _result = MessageBoxResult.Cancel;
+            
             DialogResult = false;
             Close();
         }
@@ -196,23 +216,11 @@ private void Button_Cancel(object sender, RoutedEventArgs e)
         {
             e.Handled = true;
 
-            // Replicates System.Windows.MessageBox behavior
-            // https://learn.microsoft.com/en-us/dotnet/api/system.windows.messageboxresult#remarks
-            
-            switch (_button)
+            if (_button == MessageBoxButton.YesNo)
             {
                 // For YesNo, the close button should be hidden and inaccessible.
-                case MessageBoxButton.YesNo:
-                    App.API.LogWarn(ClassName, "Close button was invoked despite being hidden for YesNo dialog");
-                    return;
-                case MessageBoxButton.OK:
-                    _result = MessageBoxResult.OK;
-                    break;
-                case MessageBoxButton.OKCancel:
-                case MessageBoxButton.YesNoCancel:
-                default:
-                    _result = MessageBoxResult.Cancel;
-                    break;
+                App.API.LogWarn(ClassName, "Close button was invoked despite being hidden for YesNo dialog");
+                return;
             }
 
             msgBox.Close();