Fix #2768: Restore/Refactor of EventWindow

Refactor EventWindow to use a dynamic List for option buttons and improve button creation logic. Also restores the ability to use .json file templates for event Dialogues.

Author: Arufonsu

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

@@ -1,3 +1,4 @@
+using Intersect.Client.Core;
 using Intersect.Client.Core.Controls;
 using Intersect.Client.Entities.Events;
 using Intersect.Client.Framework.Content;
@@ -26,14 +27,13 @@ public partial class EventWindow : Panel
     private readonly IFont? _defaultFont;
 
     private readonly Panel _promptPanel;
-
     private readonly ImagePanel _faceImage;
     private readonly ScrollControl _promptScroller;
     private readonly Label _promptTemplateLabel;
     private readonly RichLabel _promptLabel;
 
     private readonly Panel _optionsPanel;
-    private readonly Button[] _optionButtons = new Button[4];
+    private readonly List<Button> _optionButtons = new();
 
     private readonly bool _typewriting;
     private readonly long _typewriterResponseDelay = ClientConfiguration.Instance.TypewriterResponseDelay;
@@ -49,53 +49,22 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         _defaultFont = GameContentManager.Current.GetFont(name: "sourcesansproblack");
 
         Alignment = [Alignments.Center];
-        MinimumSize = new Point(520, 180);
-        MaximumSize = new Point(720, 520);
         Padding = new Padding(16);
 
         _promptPanel = new Panel(this, nameof(_promptPanel))
         {
-            Dock = Pos.Fill,
-            DockChildSpacing = new Padding(8),
+            DockChildSpacing = new Padding(8), Margin = new Margin(16, 8, 16, 8),
         };
 
         _optionsPanel = new Panel(this, nameof(_optionsPanel))
         {
             BackgroundColor = Color.Transparent,
-            Dock = Pos.Bottom,
             DockChildSpacing = new Padding(8),
-            Margin = new Margin(0, 8, 0, 0),
+            Margin = new Margin(8, 8, 8, 0),
         };
 
-        for (var optionIndex = 0; optionIndex < 4; ++optionIndex)
-        {
-            var optionButton = new Button(_optionsPanel, $"{nameof(_optionButtons)}[{optionIndex}]")
-            {
-                Dock = Pos.Top,
-                Font = _defaultFont,
-                FontSize = 12,
-                UserData = (EventResponseType)(optionIndex + 1),
-            };
-            optionButton.Clicked += (sender, _) =>
-            {
-                if (sender.UserData is not EventResponseType eventResponseType)
-                {
-                    return;
-                }
-
-                CloseEventResponse(eventResponseType);
-            };
-            _optionButtons[optionIndex] = optionButton;
-        }
-
-        _optionsPanel.PostLayout.Enqueue(
-            ResizeOptionsPanelToChildren,
-            _optionsPanel
-        );
-
-        _faceImage = new ImagePanel(_promptPanel, nameof(_faceImage))
+        _faceImage = new ImagePanel(this, nameof(_faceImage))
         {
-            Dock = Pos.Left,
             MaintainAspectRatio = true,
             Margin = new Margin(8, 8, 0, 8),
             MaximumSize = new Point(128, 128),
@@ -122,13 +91,26 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
             Padding = new Padding(8),
         };
 
-        _promptPanel.SizeToChildren(recursive: true);
-
         #region Configure and Display
 
+        CreateOptionButtons();
+
+        try
+        {
+            Name = nameof(EventWindow);
+            LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
+        }
+        catch (Exception ex)
+        {
+            ApplicationContext.CurrentContext.Logger?.LogWarning(
+                ex,
+                "Failed to load EventWindow JSON UI, using default layout"
+            );
+        }
+
         if (_dialog.Face is { } faceTextureName)
         {
-            var faceTexture = Globals.ContentManager.GetTexture(TextureType.Face, faceTextureName);
+            var faceTexture = Globals.ContentManager?.GetTexture(TextureType.Face, faceTextureName);
             _faceImage.Texture = faceTexture;
             if (faceTexture is not null)
             {
@@ -146,29 +128,6 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
             _faceImage.IsVisibleInTree = false;
         }
 
-        var visibleOptions = _dialog.Options.Where(option => !string.IsNullOrEmpty(option)).ToArray();
-        if (visibleOptions.Length < 1)
-        {
-            visibleOptions = [Strings.EventWindow.Continue];
-        }
-
-        for (var optionIndex = 0; optionIndex < _optionButtons.Length; ++optionIndex)
-        {
-            var optionButton = _optionButtons[optionIndex];
-            if (optionIndex < visibleOptions.Length)
-            {
-                optionButton.Text = visibleOptions[optionIndex];
-                optionButton.IsVisibleInTree = true;
-            }
-            else
-            {
-                optionButton.IsVisibleInTree = false;
-            }
-        }
-
-        // Name = $"{nameof(EventWindow)}_{Math.Max(1, visibleOptions.Length)}";
-        // LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer?.GetResolutionString());
-
         SkipRender();
 
         _promptLabel.ClearText();
@@ -180,11 +139,10 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         }
 
         _promptLabel.ForceImmediateRebuild();
-
         _ = _promptLabel.SizeToChildren();
 
         _typewriting = ClientConfiguration.Instance.TypewriterEnabled &&
-                       Globals.Database.TypewriterBehavior != TypewriterBehavior.Off;
+                       Globals.Database?.TypewriterBehavior != TypewriterBehavior.Off;
         if (_typewriting)
         {
             _promptLabel.ClearText();
@@ -200,7 +158,6 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         RunOnMainThread(
             static @this =>
             {
-                @this.SizeToChildren(recursive: true);
                 @this._promptScroller.ScrollToTop();
             },
             this
@@ -209,14 +166,52 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         MakeModal(dim: true);
         BringToFront();
         Interface.InputBlockingComponents.Add(this);
-        ApplicationContext.CurrentContext.Logger.LogTrace("Event window opened");
+        ApplicationContext.CurrentContext.Logger?.LogTrace("Event window opened");
 
         #endregion Configure and Display
     }
 
-    private static void ResizeOptionsPanelToChildren(Panel optionsPanel)
+    private void CreateOptionButtons()
     {
-        optionsPanel.SizeToChildren(new SizeToChildrenArgs(Recurse: true));
+        // Clear existing buttons
+        foreach (var button in _optionButtons)
+        {
+            button.Dispose();
+        }
+
+        _optionButtons.Clear();
+
+        // Get visible options
+        var visibleOptions = _dialog.Options.Where(option => !string.IsNullOrEmpty(option)).ToArray();
+        if (visibleOptions.Length < 1)
+        {
+            visibleOptions = [Strings.EventWindow.Continue];
+        }
+
+        // Create buttons dynamically based on actual options
+        for (var optionIndex = 0; optionIndex < visibleOptions.Length; optionIndex++)
+        {
+            var optionButton = new Button(_optionsPanel, $"OptionButton_{optionIndex}")
+            {
+                Dock = Pos.Bottom,
+                Font = _defaultFont,
+                FontSize = 12,
+                Text = visibleOptions[optionIndex],
+                UserData = (EventResponseType)(optionIndex + 1),
+            };
+
+            optionButton.Clicked += (sender, _) =>
+            {
+                if (sender.UserData is not EventResponseType eventResponseType)
+                {
+                    return;
+                }
+
+                CloseEventResponse(eventResponseType);
+            };
+
+            _optionButtons.Add(optionButton);
+        }
     }
 
     protected override void OnMouseClicked(MouseButton mouseButton, Point mousePosition, bool userAction = true)
@@ -318,6 +313,7 @@ private void EnsureControlRestored()
         {
             _instance = null;
         }
+
         _ = Interface.InputBlockingComponents.Remove(this);
         RemoveModal();
     }