fix: Show dialogs as non-dismissable popups

Author: tuxuser

PostCodeSerialMonitor/ViewModels/ConfigurationDialogViewModel.cs

@@ -82,7 +82,7 @@ await _configurationService.UpdateConfigurationAsync(config =>
             await MessageBoxManager
                 .GetMessageBoxStandard(Assets.Resources.RestartRequired, string.Format(Assets.Resources.LanguageChangedPleaseRestart),
                     ButtonEnum.Ok)
-                .ShowAsync();
+                .ShowAsPopupAsync(GetParentWindow());
         }
     }
 

PostCodeSerialMonitor/ViewModels/MainWindowViewModel.cs

@@ -199,7 +199,7 @@ public async void OnLoaded()
                     ButtonEnum.YesNo
             );
 
-            var result = await box.ShowAsync();
+            var result = await box.ShowAsPopupAsync(GetParentWindow());
 
             if (result.HasFlag(ButtonResult.Yes))
             {
@@ -212,7 +212,7 @@ public async void OnLoaded()
                     _logger.LogError(ex, Assets.Resources.FailedUpdateMetadata);
                     await MessageBoxManager
                         .GetMessageBoxStandard(Assets.Resources.Error, string.Format(Assets.Resources.FailedUpdateMetadataMessageBoxError, ex.Message), ButtonEnum.Ok)
-                        .ShowAsync();
+                        .ShowAsPopupAsync(GetParentWindow());
                 }
             }
         }
@@ -228,7 +228,7 @@ await MessageBoxManager
                 .GetMessageBoxStandard(Assets.Resources.Warning, Assets.Resources.FailedLoadLocalMetadataMessageBoxWarning,
                     ButtonEnum.Ok);
 
-            await box.ShowAsync();
+            await box.ShowAsPopupAsync(GetParentWindow());
         }
 
         try
@@ -241,7 +241,7 @@ await MessageBoxManager
             await MessageBoxManager
                 .GetMessageBoxStandard(Assets.Resources.Error, string.Format(Assets.Resources.FailedLoadLocalMetadataMessageBoxError, ex.Message),
                     ButtonEnum.Ok)
-                .ShowAsync();
+                .ShowAsPopupAsync(GetParentWindow());
         }
 
         if (_configurationService.Config.CheckForAppUpdates)
@@ -255,7 +255,7 @@ await MessageBoxManager
                         Assets.Resources.NewAppReleaseAvailable,
                         "https://github.com/xboxoneresearch/XboxPostcodeMonitor/releases"
                     ));
-                await box.ShowAsync();
+                await box.ShowAsPopupAsync(GetParentWindow());
             }
         }
     }
@@ -328,7 +328,7 @@ private async Task SaveLogAsync()
             await MessageBoxManager
                 .GetMessageBoxStandard(Assets.Resources.Error, string.Format(Assets.Resources.ErrorSavingLogFileMessageBoxError, ex.Message),
                     ButtonEnum.Ok)
-                .ShowAsync();
+                .ShowAsPopupAsync(GetParentWindow());
         }
     }
 
@@ -370,7 +370,7 @@ private async Task ToggleConnectionAsync()
             await MessageBoxManager
                 .GetMessageBoxStandard(Assets.Resources.Error, string.Format(Assets.Resources.ErrorConectionMessageBoxError, ex.Message),
                     ButtonEnum.Ok)
-                .ShowAsync();
+                .ShowAsPopupAsync(GetParentWindow());
         }
 
         if (IsConnected && _configurationService.Config.CheckForFwUpdates)
@@ -384,7 +384,7 @@ await MessageBoxManager
                         Assets.Resources.NewFirmwareReleaseAvailable,
                         "https://github.com/xboxoneresearch/PicoDurangoPOST/releases"
                     ));
-                await box.ShowAsync();
+                await box.ShowAsPopupAsync(GetParentWindow());
             }
         }
     }
@@ -441,12 +441,4 @@ private async Task ShowConfigurationAsync()
 
         await dialog.ShowDialog(GetParentWindow());
     }
-
-    private Window GetParentWindow()
-    {
-        if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            return desktop?.MainWindow ?? throw new Exception(Assets.Resources.FailedGetMainWindow);
-        else
-            throw new Exception(Assets.Resources.FailedGetApplicationLifetime);
-    }
 } 

PostCodeSerialMonitor/ViewModels/ViewModelBase.cs

@@ -1,7 +1,17 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace PostCodeSerialMonitor.ViewModels;
 
 public class ViewModelBase : ObservableObject
 {
+    internal Window GetParentWindow()
+    {
+        if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            return desktop?.MainWindow ?? throw new Exception(Assets.Resources.FailedGetMainWindow);
+        else
+            throw new Exception(Assets.Resources.FailedGetApplicationLifetime);
+    }
 }