chore: refactor input box (#2348)

AscensionGameDev · Jul 27, 2024 · 23c61b7 · 23c61b7
1 parent c0ee572
commit 23c61b7
Show file tree

Hide file tree

Showing 18 changed files with 726 additions and 837 deletions.
diff --git a/Intersect.Client.Framework/Gwen/Control/ResizableControl.cs b/Intersect.Client.Framework/Gwen/Control/ResizableControl.cs
@@ -1,4 +1,4 @@
-using Intersect.Client.Framework.Gwen.ControlInternal;
+using Intersect.Client.Framework.Gwen.ControlInternal;
 
 using Newtonsoft.Json.Linq;
 
@@ -20,7 +20,7 @@ public partial class ResizableControl : Base
     /// </summary>
     /// <param name="parent">Parent control.</param>
     /// <param name="name">name of this control</param>
-    public ResizableControl(Base parent, string? name) : base(parent, name)
+    public ResizableControl(Base? parent, string? name) : base(parent, name)
     {
         mResizer = new Resizer[10];
         MinimumSize = new Point(5, 5);

diff --git a/Intersect.Client.Framework/Gwen/Control/WindowControl.cs b/Intersect.Client.Framework/Gwen/Control/WindowControl.cs
@@ -72,7 +72,7 @@ public Padding InnerPanelPadding
     /// <param name="title">Window title.</param>
     /// <param name="modal">Determines whether the window should be modal.</param>
     /// <param name="name">name of this control</param>
-    public WindowControl(Base parent, string? title = default, bool modal = false, string? name = default) : base(parent, name)
+    public WindowControl(Base? parent, string? title = default, bool modal = false, string? name = default) : base(parent, name)
     {
         mTitleBar = new Dragger(this);
         mTitleBar.Height = 24;

diff --git a/Intersect.Client/Core/Input.cs b/Intersect.Client/Core/Input.cs
@@ -7,6 +7,7 @@
 using Intersect.Client.General;
 using Intersect.Client.Interface;
 using Intersect.Client.Interface.Game;
+using Intersect.Client.Interface.Shared;
 using Intersect.Client.Maps;
 using Intersect.Client.Networking;
 using Intersect.Configuration;
@@ -82,12 +83,10 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                 {
                     try
                     {
-                        var iBox = (InputBox)Interface.Interface.InputBlockingElements[i];
-                        if (iBox != null && !iBox.IsHidden)
+                        if (Interface.Interface.InputBlockingElements[i] is InputBox inputBox && !inputBox.IsHidden)
                         {
-                            iBox.okayBtn_Clicked(null, null);
+                            inputBox.SubmitInput();
                             canFocusChat = false;
-
                             break;
                         }
                     }