fix: UI overhaul, SettingsWindow rewrite to be an actual WindowControl

Framework/Intersect.Framework/Serialization/JObjectExtensions.cs

@@ -0,0 +1,36 @@
+using Newtonsoft.Json.Linq;
+
+namespace Intersect.Framework.Serialization;
+
+public static class JObjectExtensions
+{
+    public static bool TryGet<TEnum>(this JObject @object, string propertyName, out TEnum propertyValue)
+        where TEnum : struct, Enum =>
+        TryGet(@object, propertyName, default, out propertyValue);
+
+    public static bool TryGet<TEnum>(this JObject @object, string propertyName, TEnum defaultValue, out TEnum propertyValue)
+        where TEnum : struct, Enum
+    {
+        if ([email protected](propertyName, out var token))
+        {
+            propertyValue = defaultValue;
+            return false;
+        }
+
+        if (token is not JValue { Type: JTokenType.String } value)
+        {
+            propertyValue = defaultValue;
+            return false;
+        }
+
+        var rawEnum = value.Value<string>();
+        if (Enum.TryParse(rawEnum, out propertyValue))
+        {
+            return true;
+        }
+
+        propertyValue = defaultValue;
+        return false;
+
+    }
+}

Intersect.Client.Core/Core/Input.cs

@@ -82,12 +82,12 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                 return;
 
             case Keys.Enter:
-
-                for (int i = Interface.Interface.InputBlockingElements.Count - 1; i >= 0; i--)
+                for (int i = Interface.Interface.InputBlockingComponents.Count - 1; i >= 0; i--)
                 {
+                    var inputBlockingComponent = Interface.Interface.InputBlockingComponents[i];
                     try
                     {
-                        if (Interface.Interface.InputBlockingElements[i] is InputBox inputBox && !inputBox.IsHidden)
+                        if (inputBlockingComponent is InputBox { IsHidden: false } inputBox)
                         {
                             inputBox.SubmitInput();
                             canFocusChat = false;
@@ -98,8 +98,7 @@ public static void OnKeyPressed(Keys modifier, Keys key)
 
                     try
                     {
-                        var eventWindow = (EventWindow)Interface.Interface.InputBlockingElements[i];
-                        if (eventWindow != null && !eventWindow.IsHidden && Globals.EventDialogs.Count > 0)
+                        if (inputBlockingComponent is EventWindow { IsHidden: false } eventWindow && Globals.EventDialogs.Count > 0)
                         {
                             eventWindow.CloseEventResponse(EventResponseType.OneOption);
                             canFocusChat = false;
@@ -109,7 +108,6 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                     }
                     catch { }
                 }
-
                 break;
         }
 
@@ -358,30 +356,30 @@ public static void OnKeyReleased(Keys modifier, Keys key)
         }
     }
 
-    public static void OnMouseDown(Keys modifier, MouseButtons btn)
+    public static void OnMouseDown(Keys modifier, MouseButton btn)
     {
         var key = Keys.None;
         switch (btn)
         {
-            case MouseButtons.Left:
+            case MouseButton.Left:
                 key = Keys.LButton;
 
                 break;
 
-            case MouseButtons.Right:
+            case MouseButton.Right:
                 key = Keys.RButton;
 
                 break;
 
-            case MouseButtons.Middle:
+            case MouseButton.Middle:
                 key = Keys.MButton;
 
                 break;
-            case MouseButtons.X1:
+            case MouseButton.X1:
                 key = Keys.XButton1;
 
                 break;
-            case MouseButtons.X2:
+            case MouseButton.X2:
                 key = Keys.XButton2;
 
                 break;
@@ -408,7 +406,7 @@ public static void OnMouseDown(Keys modifier, MouseButtons btn)
             return;
         }
 
-        if (modifier == Keys.None && btn == MouseButtons.Left && Globals.Me.TryTarget())
+        if (modifier == Keys.None && btn == MouseButton.Left && Globals.Me.TryTarget())
         {
             return;
         }
@@ -442,25 +440,25 @@ public static void OnMouseDown(Keys modifier, MouseButtons btn)
         }
     }
 
-    public static void OnMouseUp(Keys modifier, MouseButtons btn)
+    public static void OnMouseUp(Keys modifier, MouseButton btn)
     {
         var key = Keys.LButton;
         switch (btn)
         {
-            case MouseButtons.Right:
+            case MouseButton.Right:
                 key = Keys.RButton;
 
                 break;
 
-            case MouseButtons.Middle:
+            case MouseButton.Middle:
                 key = Keys.MButton;
 
                 break;
-            case MouseButtons.X1:
+            case MouseButton.X1:
                 key = Keys.XButton1;
 
                 break;
-            case MouseButtons.X2:
+            case MouseButton.X2:
                 key = Keys.XButton2;
 
                 break;
@@ -487,7 +485,7 @@ public static void OnMouseUp(Keys modifier, MouseButtons btn)
             return;
         }
 
-        if (btn != MouseButtons.Right)
+        if (btn != MouseButton.Right)
         {
             return;
         }

Intersect.Client.Core/Entities/Player.cs

@@ -1769,7 +1769,7 @@ private void AutoTurnToTarget(Entity en)
 
     private static void ToggleTargetContextMenu(Entity en)
     {
-        if (Globals.InputManager.MouseButtonDown(MouseButtons.Right))
+        if (Globals.InputManager.MouseButtonDown(MouseButton.Right))
         {
             Interface.Interface.GameUi.TargetContextMenu.ToggleHidden(en);
         }