Revert "changed Provider method into a getter property. Passing by reference instead of a func<>."

This reverts commit 2abebfa.

Author: DerekGooding

Intersect.Client.Core/Interface/Game/EscapeMenu.cs

@@ -12,15 +12,15 @@ namespace Intersect.Client.Interface.Game;
 
 public partial class EscapeMenu : ImagePanel
 {
-    private readonly SettingsWindow _settingsWindow;
+    private readonly Func<SettingsWindow> _settingsWindowProvider;
     private readonly Button _buttonCharacterSelect;
     private readonly Panel _versionPanel;
 
     private readonly Framework.Graphics.GameFont _font;
 
-    public EscapeMenu(Canvas gameCanvas, SettingsWindow settingsWindow) : base(gameCanvas, nameof(EscapeMenu))
+    public EscapeMenu(Canvas gameCanvas, Func<SettingsWindow> settingsWindowProvider) : base(gameCanvas, nameof(EscapeMenu))
     {
-        _settingsWindow = settingsWindow;
+        _settingsWindowProvider = settingsWindowProvider;
 
         Interface.InputBlockingComponents.Add(this);
 
@@ -113,7 +113,8 @@ public override void Invalidate()
     /// <inheritdoc />
     public override void ToggleHidden()
     {
-        if (_settingsWindow.IsVisible)
+        var settingsWindow = _settingsWindowProvider();
+        if (settingsWindow.IsVisible)
         {
             return;
         }
@@ -133,7 +134,8 @@ public void Update()
 
     public void OpenSettingsWindow(bool returnToMenu = false)
     {
-        _settingsWindow.Show(returnToMenu ? this : null);
+        var settingsWindow = _settingsWindowProvider();
+        settingsWindow.Show(returnToMenu ? this : null);
         Hide();
     }
 

Intersect.Client.Core/Interface/Game/GameInterface.cs

@@ -92,22 +92,21 @@ public partial class GameInterface : MutableInterface
 
     public PlayerStatusWindow PlayerStatusWindow;
 
-    private SettingsWindow SettingsWindow
+    private SettingsWindow GetOrCreateSettingsWindow()
     {
-        get
+        _settingsWindow ??= new SettingsWindow(GameCanvas)
         {
-            return _settingsWindow ??= new SettingsWindow(GameCanvas)
-            {
-                IsVisible = false,
-            };
-        }
+            IsVisible = false,
+        };
+
+        return _settingsWindow;
     }
 
     public GameInterface(Canvas canvas) : base(canvas)
     {
         GameCanvas = canvas;
-        EscapeMenu = new EscapeMenu(GameCanvas, SettingsWindow) {IsHidden = true};
-        SimplifiedEscapeMenu = new SimplifiedEscapeMenu(GameCanvas, SettingsWindow) {IsHidden = true};
+        EscapeMenu = new EscapeMenu(GameCanvas, GetOrCreateSettingsWindow) {IsHidden = true};
+        SimplifiedEscapeMenu = new SimplifiedEscapeMenu(GameCanvas, GetOrCreateSettingsWindow) {IsHidden = true};
         TargetContextMenu = new TargetContextMenu(GameCanvas) {IsHidden = true};
         AnnouncementWindow = new AnnouncementWindow(GameCanvas) { IsHidden = true };
 

Intersect.Client.Core/Interface/Game/SimplifiedEscapeMenu.cs

@@ -12,17 +12,17 @@ namespace Intersect.Client.Interface.Game;
 
 public sealed partial class SimplifiedEscapeMenu : Framework.Gwen.Control.Menu
 {
-    private readonly SettingsWindow _settingsWindow;
+    private readonly Func<SettingsWindow> _settingsWindowProvider;
     private readonly MenuItem _settings;
     private readonly MenuItem _character;
     private readonly MenuItem _logout;
     private readonly MenuItem _exit;
 
-    public SimplifiedEscapeMenu(Canvas gameCanvas, SettingsWindow settingsWindow) : base(gameCanvas, nameof(SimplifiedEscapeMenu))
+    public SimplifiedEscapeMenu(Canvas gameCanvas, Func<SettingsWindow> settingsWindowProvider) : base(gameCanvas, nameof(SimplifiedEscapeMenu))
     {
         IsHidden = true;
         IconMarginDisabled = true;
-        _settingsWindow = settingsWindow;
+        _settingsWindowProvider = settingsWindowProvider;
 
         Children.Clear();
 
@@ -41,7 +41,8 @@ public SimplifiedEscapeMenu(Canvas gameCanvas, SettingsWindow settingsWindow) :
 
     public void ToggleHidden(Button? target)
     {
-        if (!_settingsWindow.IsHidden || target == null)
+        var settingsWindow = _settingsWindowProvider();
+        if (!settingsWindow.IsHidden || target == null)
         {
             return;
         }
@@ -123,10 +124,13 @@ private static void ShowCombatWarning()
 
     private void OpenSettingsWindow(object? sender, EventArgs? e)
     {
-        if (!_settingsWindow.IsVisible)
+        var settingsWindow = _settingsWindowProvider();
+        if (settingsWindow.IsVisible)
         {
-            _settingsWindow.Show();
+            return;
         }
+
+        settingsWindow.Show();
     }
 
     private static void LogoutToCharacterSelect(object? sender, EventArgs? e)