Refactors EventWindow

Updates code logic and methods, moves dialogue options into a scrollable _optionsPanel, recreates option buttons dynamically per dialog, and keeps typewriter gating/response delay logic intact.​

Author: Arufonsu

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

@@ -24,22 +24,19 @@ namespace Intersect.Client.Interface.Game;
 
 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 IFont? _defaultFont;
+    private Panel _promptPanel;
+    private ImagePanel _faceImage;
+    private ScrollControl _promptScroller;
+    private Label _promptTemplateLabel;
+    private RichLabel _promptLabel;
+    private ScrollControl _optionsPanel;
     private readonly List<Button> _optionButtons = new();
-
-    private readonly bool _typewriting;
+    private bool _typewriting;
     private readonly long _typewriterResponseDelay = ClientConfiguration.Instance.TypewriterResponseDelay;
-    private readonly Typewriter? _writer;
-
+    private Typewriter? _writer;
     private readonly Dialog _dialog;
+    private static EventWindow? _instance;
 
     private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(EventWindow))
     {
@@ -49,24 +46,22 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         _defaultFont = GameContentManager.Current.GetFont(name: "sourcesansproblack");
 
         Alignment = [Alignments.Center];
-        Padding = new Padding(16);
+        Padding = new Padding(12);
 
+        // Create controls first (so JSON can style/layout existing nodes)
         _promptPanel = new Panel(this, nameof(_promptPanel))
         {
-            DockChildSpacing = new Padding(8), Margin = new Margin(16, 8, 16, 8),
+            DockChildSpacing = new Padding(12),
         };
 
-        _optionsPanel = new Panel(this, nameof(_optionsPanel))
+        _optionsPanel = new ScrollControl(this, nameof(_optionsPanel))
         {
-            BackgroundColor = Color.Transparent,
-            DockChildSpacing = new Padding(8),
-            Margin = new Margin(8, 8, 8, 0),
+            DockChildSpacing = new Padding(4),
         };
 
         _faceImage = new ImagePanel(this, nameof(_faceImage))
         {
             MaintainAspectRatio = true,
-            Margin = new Margin(8, 8, 0, 8),
             MaximumSize = new Point(128, 128),
             RestrictToParent = true,
         };
@@ -88,13 +83,12 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
             Dock = Pos.Fill,
             Font = _defaultFont,
             FontSize = 12,
-            Padding = new Padding(8),
+            Padding = new Padding(12),
         };
 
-        #region Configure and Display
-
         CreateOptionButtons();
 
+        // Load JSON to apply layout/templates
         try
         {
             Name = nameof(EventWindow);
@@ -104,30 +98,47 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         {
             ApplicationContext.CurrentContext.Logger?.LogWarning(
                 ex,
-                "Failed to load EventWindow JSON UI, using default layout"
+                "Failed to load EventWindow JSON UI, using code defaults."
             );
         }
 
+        ApplyFace();
+        ApplyPromptAndTypewriter();
+        RunOnMainThread(static @this => @this._promptScroller.ScrollToTop(), this);
+
+        var dimmedBackground = ClientConfiguration.Instance.DimmedEventWindowBackground;
+        MakeModal(dim: dimmedBackground);
+        BringToFront();
+        Interface.InputBlockingComponents.Add(this);
+        ApplicationContext.CurrentContext.Logger?.LogTrace("Event window opened");
+    }
+
+    private void ApplyFace()
+    {
         if (_dialog.Face is { } faceTextureName)
         {
             var faceTexture = Globals.ContentManager?.GetTexture(TextureType.Face, faceTextureName);
             _faceImage.Texture = faceTexture;
-            if (faceTexture is not null)
+
+            var show = faceTexture is not null;
+            _faceImage.IsHidden = !show;
+            _faceImage.IsVisibleInParent = show;
+
+            if (show)
             {
-                _faceImage.IsVisibleInTree = true;
                 _faceImage.SizeToContents();
             }
-            else
-            {
-                _faceImage.IsVisibleInTree = false;
-            }
         }
         else
         {
             _faceImage.Texture = null;
-            _faceImage.IsVisibleInTree = false;
+            _faceImage.IsHidden = true;
+            _faceImage.IsVisibleInParent = false;
         }
+    }
 
+    private void ApplyPromptAndTypewriter()
+    {
         SkipRender();
 
         _promptLabel.ClearText();
@@ -143,6 +154,7 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
 
         _typewriting = ClientConfiguration.Instance.TypewriterEnabled &&
                        Globals.Database?.TypewriterBehavior != TypewriterBehavior.Off;
+
         if (_typewriting)
         {
             _promptLabel.ClearText();
@@ -154,42 +166,29 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
                 }
             );
         }
-
-        RunOnMainThread(
-            static @this =>
-            {
-                @this._promptScroller.ScrollToTop();
-            },
-            this
-        );
-
-        var dimmedBackground = ClientConfiguration.Instance.DimmedEventWindowBackground;
-        MakeModal(dim: dimmedBackground);
-        BringToFront();
-        Interface.InputBlockingComponents.Add(this);
-        ApplicationContext.CurrentContext.Logger?.LogTrace("Event window opened");
-
-        #endregion Configure and Display
+        else
+        {
+            _writer = null;
+        }
     }
 
     private void CreateOptionButtons()
     {
-        // Clear existing buttons
+        // Clear existing buttons we created
         foreach (var button in _optionButtons)
         {
             button.Dispose();
         }
 
         _optionButtons.Clear();
+        _optionsPanel.ClearChildren();
 
-        // 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}")
@@ -215,29 +214,9 @@ private void CreateOptionButtons()
         }
     }
 
-    protected override void OnMouseClicked(MouseButton mouseButton, Point mousePosition, bool userAction = true)
-    {
-        base.OnMouseClicked(mouseButton, mousePosition, userAction);
-
-        SkipTypewriting();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        EnsureControlRestored();
-        base.Dispose(disposing);
-    }
-
-    private static EventWindow? _instance;
-
     private void Update()
     {
-        if (!IsVisibleInTree || !_typewriting)
-        {
-            return;
-        }
-
-        if (_writer is null)
+        if (!IsVisibleInTree || !_typewriting || _writer is null)
         {
             return;
         }
@@ -246,13 +225,12 @@ private void Update()
 
         foreach (var optionButton in _optionButtons)
         {
-            optionButton.IsVisibleInTree = writerCompleted && !string.IsNullOrEmpty(optionButton.Text);
+            optionButton.IsVisibleInParent = writerCompleted && !string.IsNullOrEmpty(optionButton.Text);
         }
 
         if (writerCompleted)
         {
-            var disableResponse = Timing.Global.MillisecondsUtc - _writer.DoneAtMilliseconds <
-                                  _typewriterResponseDelay;
+            var disableResponse = Timing.Global.MillisecondsUtc - _writer.DoneAtMilliseconds < _typewriterResponseDelay;
             foreach (var optionButton in _optionButtons)
             {
                 optionButton.IsDisabled = disableResponse;
@@ -275,7 +253,6 @@ public static void ShowOrUpdateDialog(Canvas canvas)
     {
         if (_instance is { } instance)
         {
-            // ApplicationContext.CurrentContext.Logger.LogTrace("Updating previous opened event window");
             instance.Update();
             return;
         }
@@ -308,6 +285,16 @@ public void CloseEventResponse(EventResponseType response)
         EnsureDestroyed();
     }
 
+    private void SkipTypewriting()
+    {
+        if (_writer?.IsDone ?? true)
+        {
+            return;
+        }
+
+        _writer.End();
+    }
+
     private void EnsureControlRestored()
     {
         if (_instance == this)
@@ -333,13 +320,15 @@ private void EnsureDestroyed()
         }
     }
 
-    private void SkipTypewriting()
+    protected override void Dispose(bool disposing)
     {
-        if (_writer?.IsDone ?? true)
-        {
-            return;
-        }
+        EnsureControlRestored();
+        base.Dispose(disposing);
+    }
 
-        _writer.End();
+    protected override void OnMouseClicked(MouseButton mouseButton, Point mousePosition, bool userAction = true)
+    {
+        base.OnMouseClicked(mouseButton, mousePosition, userAction);
+        SkipTypewriting();
     }
 }