fix gpu allocations table

Author: pandinocoder

Intersect.Client.Core/Interface/Debugging/DebugWindow.cs

@@ -106,12 +106,23 @@ private Table CreateGPUAllocationsTable(Base parent)
             MinimumSize = new Point(x: 408, y: 0),
             SizeToContents = true,
         };
+        table.VisibilityChanged += (sender, args) =>
+        {
+            if (!args.IsVisibleInTree || !_resizeGPUAllocationsTable)
+            {
+                return;
+            }
+
+            _resizeGPUAllocationsTable = false;
+            sender.SizeToChildren(recursive: true);
+            sender.InvalidateParent();
+        };
         table.SizeChanged += ResizeTableToChildrenOnSizeChanged;
 
         var existingTextures = Graphics.Renderer.Textures;
         foreach (var texture in existingTextures)
         {
-            // _ = EnsureGPUAllocationsRowFor(gameTexture: texture, creating: true, table: table);
+            _ = EnsureGPUAllocationsRowFor(gameTexture: texture, creating: true, table: table);
         }
 
         SubscribeGPU();
@@ -215,11 +226,20 @@ private TableRow EnsureGPUAllocationsRowFor(IGameTexture gameTexture, bool creat
         }
         _gpuAllocationsRowByTextureLookup[gameTexture] = existingRow;
 
-        table.SizeToChildren(recursive: true);
+        if (table.IsVisibleInTree)
+        {
+            table.SizeToChildren(recursive: true);
+        }
+        else
+        {
+            _resizeGPUAllocationsTable = true;
+        }
 
         return existingRow;
     }
 
+    private bool _resizeGPUAllocationsTable;
+
     private static void CopyAssetNameToClipboardOnNameCellClicked(Base sender, MouseButtonState _)
     {
         if (sender.UserData is IAsset asset)

Intersect.Client.Core/Interface/Menu/MainMenu.cs

@@ -5,107 +5,115 @@
 using Intersect.Client.Interface.Shared;
 using Intersect.Framework.Core;
 using Intersect.Network;
-using Intersect.Utilities;
 
 namespace Intersect.Client.Interface.Menu;
 
 public partial class MainMenu : MutableInterface
 {
     private readonly Canvas _menuCanvas;
     private readonly MainMenuWindow _mainMenuWindow;
-    private readonly LoginWindow _loginWindow;
-    private readonly RegistrationWindow _registerWindow;
-    private readonly ForgotPasswordWindow _forgotPasswordWindow;
-    private readonly ResetPasswordWindow _resetPasswordWindow;
-    private readonly CharacterCreationWindow _characterCreationWindow;
-    private readonly CreditsWindow _creditsWindow;
-
-    public readonly SelectCharacterWindow SelectCharacterWindow;
-
-    //Character creation feild check
-    private bool mShouldOpenCharacterCreation;
-    private bool mShouldOpenCharacterSelection;
+
+    private bool _shouldOpenCharacterCreation;
+    private bool _shouldOpenCharacterSelection;
     private bool _forceCharacterCreation;
 
     // Network status
     public static NetworkStatus ActiveNetworkStatus;
+
     public delegate void NetworkStatusHandler();
-    public static NetworkStatusHandler? NetworkStatusChanged;
+
+    public static event NetworkStatusHandler? NetworkStatusChanged;
     internal static event EventHandler? ReceivedConfiguration;
 
     public static long LastNetworkStatusChangeTime { get; private set; }
 
-    private SettingsWindow? _settingsWindow;
-    private SettingsWindow SettingsWindow => _settingsWindow ??= new SettingsWindow(_menuCanvas)
+    private LoginWindow? _loginWindow;
+
+    private LoginWindow LoginWindow => _loginWindow ??= new LoginWindow(_menuCanvas, this)
     {
         Alignment = [Alignments.CenterH],
         Y = 480,
         IsVisibleInTree = false,
     };
 
-    public MainMenu(Canvas menuCanvas) : base(menuCanvas)
+    private RegistrationWindow? _registrationWindow;
+
+    private RegistrationWindow RegistrationWindow => _registrationWindow ??= new RegistrationWindow(_menuCanvas, this)
     {
-        _menuCanvas = menuCanvas;
-        _mainMenuWindow = new MainMenuWindow(_menuCanvas, this)
-        {
-            Alignment = [Alignments.CenterH],
-            Y = 480,
-            IsVisibleInTree = true,
-        };
+        Alignment = [Alignments.CenterH],
+        Y = 480,
+        IsVisibleInTree = false,
+    };
 
-        var logo = new ImagePanel(menuCanvas, "Logo");
-        logo.LoadJsonUi(GameContentManager.UI.Menu, Graphics.Renderer?.GetResolutionString());
+    private ForgotPasswordWindow? _forgotPasswordWindow;
 
-        NetworkStatusChanged += HandleNetworkStatusChanged;
+    private ForgotPasswordWindow ForgotPasswordWindow => _forgotPasswordWindow ??= new ForgotPasswordWindow(_menuCanvas, this)
+    {
+        // Alignment = [Alignments.CenterH],
+        // Y = 480,
+        // IsVisible = false,
+    };
 
-        _loginWindow = new LoginWindow(_menuCanvas, this)
-        {
-            Alignment = [Alignments.CenterH],
-            Y = 480,
-            IsVisibleInTree = false,
-        };
+    private ResetPasswordWindow? _resetPasswordWindow;
 
-        _registerWindow = new RegistrationWindow(_menuCanvas, this)
-        {
-            Alignment = [Alignments.CenterH],
-            Y = 480,
-            IsVisibleInTree = false,
-        };
+    private ResetPasswordWindow ResetPasswordWindow => _resetPasswordWindow ??= new ResetPasswordWindow(_menuCanvas, this)
+    {
+        // Alignment = [Alignments.CenterH],
+        // Y = 480,
+        // IsVisible = false,
+    };
 
-        _creditsWindow = new CreditsWindow(_menuCanvas, this)
-        {
-            Alignment = [Alignments.CenterH],
-            Y = 480,
-            IsVisibleInTree = false,
-        };
+    private CharacterCreationWindow? _characterCreationWindow;
 
-        _forgotPasswordWindow = new ForgotPasswordWindow(_menuCanvas, this)
-        {
-            // Alignment = [Alignments.CenterH],
-            // Y = 480,
-            // IsVisible = false,
-        };
+    private CharacterCreationWindow CharacterCreationWindow => _characterCreationWindow ??= new CharacterCreationWindow(_menuCanvas, this, SelectCharacterWindow)
+    {
+        Alignment = [Alignments.CenterH],
+        Y = 480,
+        IsVisibleInTree = false,
+    };
 
-        _resetPasswordWindow = new ResetPasswordWindow(_menuCanvas, this)
-        {
-            // Alignment = [Alignments.CenterH],
-            // Y = 480,
-            // IsVisible = false,
-        };
+    private CreditsWindow? _creditsWindow;
 
-        SelectCharacterWindow = new SelectCharacterWindow(_menuCanvas, this)
+    private CreditsWindow CreditsWindow => _creditsWindow ??= new CreditsWindow(_menuCanvas, this)
+    {
+        Alignment = [Alignments.CenterH],
+        Y = 480,
+        IsVisibleInTree = false,
+    };
+
+    private SelectCharacterWindow? _selectCharacterWindow;
+
+    public SelectCharacterWindow SelectCharacterWindow => _selectCharacterWindow ??=
+        new SelectCharacterWindow(_menuCanvas, this)
         {
             Alignment = [Alignments.CenterH],
             Y = 480,
             IsVisibleInTree = false,
         };
 
-        _characterCreationWindow = new CharacterCreationWindow(_menuCanvas, this, SelectCharacterWindow)
+    private SettingsWindow? _settingsWindow;
+
+    private SettingsWindow SettingsWindow => _settingsWindow ??= new SettingsWindow(_menuCanvas)
+    {
+        Alignment = [Alignments.CenterH],
+        Y = 480,
+        IsVisibleInTree = false,
+    };
+
+    public MainMenu(Canvas menuCanvas) : base(menuCanvas)
+    {
+        _menuCanvas = menuCanvas;
+        _mainMenuWindow = new MainMenuWindow(_menuCanvas, this)
         {
             Alignment = [Alignments.CenterH],
             Y = 480,
-            IsVisibleInTree = false,
+            IsVisibleInTree = true,
         };
+
+        var logo = new ImagePanel(menuCanvas, "Logo");
+        logo.LoadJsonUi(GameContentManager.UI.Menu, Graphics.Renderer.GetResolutionString());
+
+        NetworkStatusChanged += HandleNetworkStatusChanged;
     }
 
     ~MainMenu()
@@ -127,29 +135,29 @@ public void Update(TimeSpan elapsed, TimeSpan total)
             _mainMenuWindow.Update();
         }
 
-        if (mShouldOpenCharacterSelection)
+        if (_shouldOpenCharacterSelection)
         {
             CreateCharacterSelection();
         }
 
-        if (mShouldOpenCharacterCreation)
+        if (_shouldOpenCharacterCreation)
         {
             CreateCharacterCreation();
         }
 
-        if (!_loginWindow.IsHidden)
+        if (!LoginWindow.IsHidden)
         {
-            _loginWindow.Update();
+            LoginWindow.Update();
         }
 
-        if (!_characterCreationWindow.IsHidden)
+        if (!CharacterCreationWindow.IsHidden)
         {
-            _characterCreationWindow.Update();
+            CharacterCreationWindow.Update();
         }
 
-        if (!_registerWindow.IsHidden)
+        if (!RegistrationWindow.IsHidden)
         {
-            _registerWindow.Update();
+            RegistrationWindow.Update();
         }
 
         if (!SelectCharacterWindow.IsHidden)
@@ -164,91 +172,91 @@ public void Reset()
     {
         _settingsWindow = null;
 
-        _loginWindow.Hide();
-        _registerWindow.Hide();
-        _creditsWindow.Hide();
-        _forgotPasswordWindow.Hide();
-        _resetPasswordWindow.Hide();
-        _characterCreationWindow.Hide();
+        LoginWindow.Hide();
+        RegistrationWindow.Hide();
+        CreditsWindow.Hide();
+        ForgotPasswordWindow.Hide();
+        ResetPasswordWindow.Hide();
+        CharacterCreationWindow.Hide();
         SelectCharacterWindow.Hide();
         _mainMenuWindow.Show();
         _mainMenuWindow.Reset();
     }
 
     public void Show() => _mainMenuWindow.Show();
 
-    public void Hide() => _mainMenuWindow.Hide();
+    private void Hide() => _mainMenuWindow.Hide();
 
     public void NotifyOpenCharacterSelection(List<CharacterSelectionPreviewMetadata> characterSelectionPreviews)
     {
-        mShouldOpenCharacterSelection = true;
+        _shouldOpenCharacterSelection = true;
         SelectCharacterWindow.CharacterSelectionPreviews = [..characterSelectionPreviews];
     }
 
     public void NotifyOpenForgotPassword()
     {
         Reset();
         Hide();
-        _forgotPasswordWindow.Show();
+        ForgotPasswordWindow.Show();
     }
 
     public void NotifyOpenLogin()
     {
         Reset();
         Hide();
-        _loginWindow.Show();
+        LoginWindow.Show();
     }
 
     public void OpenResetPassword(string nameEmail)
     {
         Reset();
         Hide();
-        _resetPasswordWindow.Target = nameEmail;
-        _resetPasswordWindow.Show();
+        ResetPasswordWindow.Target = nameEmail;
+        ResetPasswordWindow.Show();
     }
 
-    public void CreateCharacterSelection()
+    private void CreateCharacterSelection()
     {
         Hide();
-        _loginWindow.Hide();
-        _registerWindow.Hide();
+        LoginWindow.Hide();
+        RegistrationWindow.Hide();
         SettingsWindow.Hide();
-        _characterCreationWindow.Hide();
+        CharacterCreationWindow.Hide();
         SelectCharacterWindow.Show();
-        mShouldOpenCharacterSelection = false;
+        _shouldOpenCharacterSelection = false;
     }
 
     public void NotifyOpenCharacterCreation(bool force = false)
     {
         _forceCharacterCreation = force;
-        mShouldOpenCharacterCreation = true;
+        _shouldOpenCharacterCreation = true;
     }
 
-    public void CreateCharacterCreation()
+    private void CreateCharacterCreation()
     {
         Hide();
-        _loginWindow.Hide();
-        _registerWindow.Hide();
+        LoginWindow.Hide();
+        RegistrationWindow.Hide();
         SettingsWindow.Hide();
         SelectCharacterWindow.Hide();
-        _characterCreationWindow.Show(force: _forceCharacterCreation);
-        mShouldOpenCharacterCreation = false;
+        CharacterCreationWindow.Show(force: _forceCharacterCreation);
+        _shouldOpenCharacterCreation = false;
     }
 
     internal void SwitchToWindow<TMainMenuWindow>() where TMainMenuWindow : IMainMenuWindow
     {
         _mainMenuWindow.Hide();
         if (typeof(TMainMenuWindow) == typeof(LoginWindow))
         {
-            _loginWindow.Show();
+            LoginWindow.Show();
         }
         else if (typeof(TMainMenuWindow) == typeof(RegistrationWindow))
         {
-            _registerWindow.Show();
+            RegistrationWindow.Show();
         }
         else if (typeof(TMainMenuWindow) == typeof(CreditsWindow))
         {
-            _creditsWindow.Show();
+            CreditsWindow.Show();
         }
     }