more event window related fixes, disabling event window JSONs because they break stuff

Author: pandinocoder

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

@@ -34,16 +34,17 @@ public partial class EventWindow : Panel
     private bool _isTypewriting;
     private readonly long _typewriterResponseDelay = ClientConfiguration.Instance.TypewriterResponseDelay;
 
-    private Dialog? _currentDialog;
+    private readonly Dialog _dialog;
 
-    public EventWindow(Canvas gameCanvas) : base(gameCanvas, nameof(EventWindow))
+    private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(EventWindow))
     {
+        _dialog = dialog;
         _defaultFont = GameContentManager.Current.GetFont(name: "sourcesansproblack", 12);
         _writer = Globals.Database.TypewriterBehavior == TypewriterBehavior.Off ? default : new Typewriter();
 
         Alignment = [Alignments.Center];
-        MinimumSize = new Point(520, 240);
-        MaximumSize = new Point(800, 600);
+        MinimumSize = new Point(520, 180);
+        MaximumSize = new Point(720, 520);
         Padding = new Padding(16);
 
         _promptPanel = new Panel(this, nameof(_promptPanel))
@@ -86,6 +87,7 @@ public EventWindow(Canvas gameCanvas) : base(gameCanvas, nameof(EventWindow))
         {
             Dock = Pos.Left,
             MaintainAspectRatio = true,
+            Margin = new Margin(8, 8, 0, 8),
             MaximumSize = new Point(128, 128),
         };
 
@@ -108,6 +110,62 @@ public EventWindow(Canvas gameCanvas) : base(gameCanvas, nameof(EventWindow))
         };
 
         _promptPanel.SizeToChildren(recursive: true);
+
+
+        #region Configure and Display
+
+        if (_dialog.Face is { } faceTextureName)
+        {
+            var faceTexture = Globals.ContentManager.GetTexture(TextureType.Face, faceTextureName);
+            _faceImage.Texture = faceTexture;
+            if (faceTexture is not null)
+            {
+                _faceImage.IsVisible = true;
+                _faceImage.SizeToContents();
+            }
+            else
+            {
+                _faceImage.IsVisible = false;
+            }
+        }
+        else
+        {
+            _faceImage.Texture = null;
+            _faceImage.IsVisible = 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.IsVisible = true;
+            }
+            else
+            {
+                optionButton.IsVisible = false;
+            }
+        }
+
+        // var optionLimit = Math.Max(1, visibleOptions.Length);
+        // Name = $"EventDialogWindow_{optionLimit}Response{(optionLimit == 1 ? string.Empty : 's')}";
+        // LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer?.GetResolutionString());
+
+        SkipRender();
+        ShowDialog();
+
+        MakeModal(dim: true);
+        BringToFront();
+        Interface.InputBlockingComponents.Add(this);
+
+        #endregion Configure and Display
     }
 
     protected override void OnMouseClicked(MouseButton mouseButton, Point mousePosition, bool userAction = true)
@@ -117,21 +175,18 @@ protected override void OnMouseClicked(MouseButton mouseButton, Point mousePosit
         SkipTypewriting();
     }
 
-    public void Update()
+    public override void Dispose()
     {
-        if (IsHidden)
-        {
-            _ = Interface.InputBlockingComponents.Remove(this);
-        }
+        EnsureControlRestored();
+        base.Dispose();
+    }
 
-        var availableDialog = Globals.EventDialogs.FirstOrDefault();
-        if (availableDialog == null)
-        {
-            return;
-        }
+    private static EventWindow? _instance;
 
+    private void Update()
+    {
         // Handle typewriting
-        if (_isTypewriting && !IsHidden)
+        if (_isTypewriting && IsVisible)
         {
             var voiceIdx = Randomization.Next(0, ClientConfiguration.Instance.TypewriterSounds.Count);
 
@@ -140,7 +195,7 @@ public void Update()
             for (var optionIndex = 0; optionIndex < _optionButtons.Length; ++optionIndex)
             {
                 var optionButton = _optionButtons[optionIndex];
-                var optionText = _currentDialog?.Options[optionIndex];
+                var optionText = _dialog?.Options[optionIndex];
                 optionButton.IsVisible = writerCompleted && !string.IsNullOrEmpty(optionText);
             }
 
@@ -163,82 +218,31 @@ public void Update()
             return;
         }
 
-        if (_currentDialog != availableDialog)
-        {
-            _currentDialog = availableDialog;
-
-            if (availableDialog.Face is { } faceTextureName)
-            {
-                var faceTexture = Globals.ContentManager.GetTexture(TextureType.Face, faceTextureName);
-                _faceImage.Texture = faceTexture;
-                if (faceTexture is not null)
-                {
-                    _faceImage.IsVisible = true;
-                    _faceImage.SizeToContents();
-                }
-                else
-                {
-                    _faceImage.IsVisible = false;
-                }
-            }
-            else
-            {
-                _faceImage.Texture = null;
-                _faceImage.IsVisible = false;
-            }
-
-            var visibleOptions = availableDialog.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.IsVisible = true;
-                }
-                else
-                {
-                    optionButton.IsVisible = false;
-                }
-            }
-
-            // Name = $"EventDialogWindow_{_optionCountLimit}Response{(_optionCountLimit == 1 ? string.Empty : 's')}";
-            // LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer?.GetResolutionString());
-
-            ShowDialog();
-
-            Defer(
-                () =>
-                {
-                    SizeToChildren(recursive: true);
-
-                    _promptScroller.ScrollToTop();
-                }
-            );
+        _isTypewriting = ClientConfiguration.Instance.TypewriterEnabled &&
+                         Globals.Database.TypewriterBehavior == TypewriterBehavior.Word;
+    }
 
-            SkipRender();
-            Show();
-            MakeModal(dim: true);
-            Interface.InputBlockingComponents.Add(this);
+    public static void ShowOrUpdateDialog(Canvas canvas)
+    {
+        if (_instance is { } instance)
+        {
+            instance.Update();
+            return;
+        }
 
-            BringToFront();
+        var availableDialog = Globals.EventDialogs.FirstOrDefault();
+        if (availableDialog == null)
+        {
+            return;
         }
 
-        _isTypewriting = ClientConfiguration.Instance.TypewriterEnabled &&
-                         Globals.Database.TypewriterBehavior == TypewriterBehavior.Word;
+        _instance = new EventWindow(canvas, availableDialog);
     }
 
     private void ShowDialog()
     {
         _promptLabel.ClearText();
-        _promptLabel.Width = _promptScroller.Width - _promptScroller.VerticalScrollBar.Width;
-
-        _promptLabel.AddText(_currentDialog?.Prompt ?? string.Empty, _promptTemplateLabel);
+        _promptLabel.AddText(_dialog?.Prompt ?? string.Empty, _promptTemplateLabel);
 
         _ = _promptLabel.SizeToChildren();
 
@@ -252,7 +256,14 @@ private void ShowDialog()
             }
         }
 
-        _promptScroller.ScrollToTop();
+        Defer(
+            () =>
+            {
+                SizeToChildren(recursive: true);
+
+                _promptScroller.ScrollToTop();
+            }
+        );
     }
 
     public void CloseEventResponse(EventResponseType response)
@@ -263,16 +274,39 @@ public void CloseEventResponse(EventResponseType response)
             return;
         }
 
-        if (_currentDialog is not { ResponseSent: false } dialog)
+        if (_dialog is not { ResponseSent: false } dialog)
         {
             return;
         }
 
         PacketSender.SendEventResponse((byte)response, dialog);
         dialog.ResponseSent = true;
 
+        EnsureDestroyed();
+    }
+
+    private void EnsureControlRestored()
+    {
+        if (_instance == this)
+        {
+            _instance = null;
+        }
+        _ = Interface.InputBlockingComponents.Remove(this);
         RemoveModal();
-        Hide();
+    }
+
+    private void EnsureDestroyed()
+    {
+        EnsureControlRestored();
+
+        if (Parent is { } parent)
+        {
+            parent.RemoveChild(this, dispose: true);
+        }
+        else
+        {
+            DelayedDelete();
+        }
     }
 
     private void SkipTypewriting()

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

@@ -127,10 +127,6 @@ public void InitGameGui()
             mPictureWindow = new PictureWindow(GameCanvas);
         }
 
-        mEventWindow = new EventWindow(GameCanvas)
-        {
-            IsVisible = false,
-        };
         mQuestOfferWindow = new QuestOfferWindow(GameCanvas);
         mMapItemWindow = new MapItemWindow(GameCanvas);
         mBankWindow = new BankWindow(GameCanvas);
@@ -357,7 +353,7 @@ public void Update()
             }
         }
 
-        mEventWindow?.Update();
+        EventWindow.ShowOrUpdateDialog(GameCanvas);
 
         //Admin window update
         if (mShouldOpenAdminWindow)

Intersect.Client.Framework/Gwen/Control/Base.cs

@@ -3538,16 +3538,15 @@ public virtual bool SizeToChildren(bool resizeX = true, bool resizeY = true, boo
         size.X = Math.Max(Math.Min(size.X, _maximumSize.X < 1 ? size.X : _maximumSize.X), _minimumSize.X);
         size.Y = Math.Max(Math.Min(size.Y, _maximumSize.Y < 1 ? size.Y : _maximumSize.Y), _minimumSize.Y);
 
-        var width = resizeX ? size.X : Width;
-        var height = resizeY ? size.Y : Height;
+        var newSize = new Point(resizeX ? size.X : Width, resizeY ? size.Y : Height);
 
         if (Dock.HasFlag(Pos.Fill))
         {
-            width = Math.Max(Width, width);
-            height = Math.Max(Height, height);
+            var dockFillSize = ApplyDockFillOnSizeToChildren(newSize, size);
+            newSize = dockFillSize;
         }
 
-        if (!SetSize(width, height))
+        if (!SetSize(newSize))
         {
             return false;
         }
@@ -3557,6 +3556,14 @@ public virtual bool SizeToChildren(bool resizeX = true, bool resizeY = true, boo
         return true;
     }
 
+    protected virtual Point ApplyDockFillOnSizeToChildren(Point size, Point internalSize)
+    {
+        return new Point(
+            Math.Max(Width, size.X),
+            Math.Max(Height, size.Y)
+        );
+    }
+
     /// <summary>
     ///     Returns the total width and height of all children.
     /// </summary>

Intersect.Client.Framework/Gwen/Control/Menu.cs

@@ -37,6 +37,8 @@ public partial class Menu : ScrollControl
     /// <param name="name"></param>
     public Menu(Base parent, string? name = default) : base(parent, name)
     {
+        _scrollPanel.Padding = default;
+
         Size = new Point(10, 10);
         Padding = Padding.Two;
         IconMarginDisabled = false;

Intersect.Client.Framework/Gwen/Control/RichLabel.cs

@@ -154,6 +154,16 @@ public override bool SizeToChildren(bool resizeX = true, bool resizeY = true, bo
         return base.SizeToChildren(resizeX: resizeX, resizeY: resizeY, recursive: recursive);
     }
 
+    protected override Point ApplyDockFillOnSizeToChildren(Point size, Point internalSize)
+    {
+        if (size.X >= internalSize.X && size.Y >= internalSize.Y)
+        {
+            return size;
+        }
+
+        return base.ApplyDockFillOnSizeToChildren(size, internalSize);
+    }
+
     public override Point GetChildrenSize()
     {
         var childrenSize = base.GetChildrenSize();

Intersect.Client.Framework/Gwen/Control/ScrollControl.cs

@@ -8,7 +8,7 @@ namespace Intersect.Client.Framework.Gwen.Control;
 /// </summary>
 public partial class ScrollControl : Base
 {
-    private readonly ScrollPanel _scrollPanel;
+    protected readonly ScrollPanel _scrollPanel;
 
     private bool _updatingScrollbars;