Change custom module settings window to be kept constructed

Author: VolcanicArts

VRCOSC.App/SDK/Modules/Module.cs

@@ -83,7 +83,7 @@ public abstract class Module
     private SerialisationManager moduleSerialisationManager = null!;
     private SerialisationManager persistenceSerialisationManager = null!;
 
-    internal Type? SettingsWindowType { get; private set; }
+    internal IManagedWindow? SettingsWindow { get; private set; }
     internal Type? RuntimeViewType { get; private set; }
 
     private bool isLoaded;
@@ -162,7 +162,9 @@ private void setSettingsWindow()
         if (!windowType.IsAssignableTo(typeof(IManagedWindow))) throw new Exception("Cannot set settings window that doesn't extend IManagedWindow");
         if (!windowType.HasConstructorThatAccepts(GetType())) throw new Exception($"Cannot set settings window that doesn't have a constructor that accepts type {GetType().Name}");
 
-        SettingsWindowType = windowType;
+        var window = (Window)Activator.CreateInstance(windowType, this)!;
+        window.Closing += (_, _) => Serialise();
+        SettingsWindow = (IManagedWindow)window;
     }
 
     private void generateMigrators()

VRCOSC.App/UI/Views/Modules/ModulesView.xaml.cs

@@ -1,7 +1,6 @@
 // Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
 // See the LICENSE file in the repository root for full license text.
 
-using System;
 using System.Windows;
 using VRCOSC.App.Modules;
 using VRCOSC.App.Profiles;
@@ -65,15 +64,7 @@ private void SettingsButton_OnClick(object sender, RoutedEventArgs e)
         var element = (FrameworkElement)sender;
         var module = (Module)element.Tag;
 
-        if (module.SettingsWindowType is not null)
-        {
-            var settingsWindow = (IManagedWindow)Activator.CreateInstance(module.SettingsWindowType, args: [module])!;
-            settingsWindowManager.TrySpawnChild(settingsWindow);
-        }
-        else
-        {
-            settingsWindowManager.TrySpawnChild(new ModuleSettingsWindow(module));
-        }
+        settingsWindowManager.TrySpawnChild(module.SettingsWindow ?? new ModuleSettingsWindow(module));
     }
 
     private void InfoButton_OnClick(object sender, RoutedEventArgs e)