Treat About window like a dialog

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.6.2 (Unreleased)
 
 - Fixed rolled log files created with trailing sequence sometimes created on app startup ([#136](https://github.com/tetsuo13/TeamsStatusPub/issues/136))
+- Prevent multiple About windows ([#129](https://github.com/tetsuo13/TeamsStatusPub/issues/129))
 
 ## 1.6.1 (2024-08-28)
 

src/TeamsStatusPub/App.axaml.cs

@@ -6,10 +6,11 @@
 using Avalonia.Markup.Xaml;
 using Microsoft.Extensions.DependencyInjection;
 using ReactiveUI;
-using TeamsStatusPub.ViewModels;
 using TeamsStatusPub.Core.Configuration;
 using TeamsStatusPub.Core.Services;
 using TeamsStatusPub.Core.Services.AvailabilityHandlers;
+using TeamsStatusPub.ViewModels;
+using TeamsStatusPub.Views;
 
 namespace TeamsStatusPub;
 
@@ -31,6 +32,7 @@ public override void OnFrameworkInitializationCompleted()
  collection.ConfigureAppServices();
  collection.AddTransient<AppViewModel>();
  collection.AddTransient<AboutViewModel>();
+ collection.AddSingleton<AboutWindow>();
 
  ServiceProvider = collection.BuildServiceProvider();
 

src/TeamsStatusPub/TeamsStatusPub.csproj

@@ -2,7 +2,7 @@
  <PropertyGroup>
  <OutputType>WinExe</OutputType>
  <TargetFramework>net8.0</TargetFramework>
- <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+ <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
  <PlatformTarget>AnyCPU</PlatformTarget>
  <Nullable>enable</Nullable>
  <BuiltInComInteropSupport>true</BuiltInComInteropSupport>

src/TeamsStatusPub/ViewModels/AppViewModel.cs

@@ -1,6 +1,7 @@
 using System.Reactive;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
+using Microsoft.Extensions.DependencyInjection;
 using ReactiveUI;
 using TeamsStatusPub.Views;
 
@@ -15,8 +16,18 @@ public AppViewModel()
  {
  AboutCommand = ReactiveCommand.Create(() =>
  {
- var view = new AboutWindow();
- view.Show();
+ // Treat the about window like a dialog: only one instance should
+ // ever be shown.
+ var view = App.ServiceProvider.GetRequiredService<AboutWindow>();
+
+ if (!view.IsVisible)
+ {
+ view.Show();
+ }
+ else
+ {
+ view.Activate();
+ }
  });
 
  ExitCommand = ReactiveCommand.Create(() =>