trying to block user input on root

Author: WeylonSantana

Intersect.Client.Core/Core/Input.cs

@@ -255,6 +255,11 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                         break;
                     }
 
+                    if (DragAndDrop.IsDragging)
+                    {
+                        break;
+                    }
+
                     switch (control)
                     {
                         case Control.Block:

Intersect.Client.Core/Entities/Entity.cs

@@ -7,7 +7,6 @@
 using Intersect.Client.Framework.Entities;
 using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
-using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.Framework.Items;
 using Intersect.Client.Framework.Maps;
 using Intersect.Client.General;
@@ -1369,7 +1368,7 @@ private int NormalSpriteAnimationFrame
             // Checks if the entity is attacking or not.
             // Note: the calculation differs with IsAttacking because
             // frames are intended to behave differently with normal sprite-sheets.
-            else if (AttackTimer - (CalculateAttackTime() / 2) > Timing.Global.Milliseconds && !DragAndDrop.IsDragging)
+            else if (AttackTimer - (CalculateAttackTime() / 2) > Timing.Global.Milliseconds)
             {
                 frame = Options.Instance.Sprites.NormalAttackFrame;
             }

Intersect.Client.Core/Entities/Player.cs

@@ -7,7 +7,6 @@
 using Intersect.Client.Framework.Gwen.Control;
 using Intersect.Client.Framework.Gwen.Control.EventArguments;
 using Intersect.Client.Framework.Gwen.Control.EventArguments.InputSubmissionEvent;
-using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.Framework.Input;
 using Intersect.Client.Framework.Items;
 using Intersect.Client.General;
@@ -1961,11 +1960,6 @@ public bool TryAttack()
             return false;
         }
 
-        if (DragAndDrop.IsDragging)
-        {
-            return false;
-        }
-
         int x = Globals.Me.X;
         int y = Globals.Me.Y;
         var map = Globals.Me.MapId;

Intersect.Client.Core/Interface/Game/Bag/BagWindow.cs

@@ -1,9 +1,7 @@
 using Intersect.Client.Core;
 using Intersect.Client.Framework.File_Management;
-using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Gwen;
 using Intersect.Client.Framework.Gwen.Control;
-using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.General;
 using Intersect.Client.Localization;
 using Intersect.Client.Utilities;
@@ -85,13 +83,6 @@ public void Update()
     public override void Hide()
     {
         _contextMenu?.Close();
-
-        // dont hide window if we are dragging something
-        if (Items.Any(c => c.IconImage == DragAndDrop.CurrentPackage?.DrawControl))
-        {
-            return;
-        }
-
         base.Hide();
     }
 }

Intersect.Client.Core/Interface/Game/Bank/BankWindow.cs

@@ -2,7 +2,6 @@
 using Intersect.Client.Framework.File_Management;
 using Intersect.Client.Framework.Gwen;
 using Intersect.Client.Framework.Gwen.Control;
-using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.General;
 using Intersect.Client.Localization;
 using Intersect.Client.Utilities;
@@ -93,13 +92,6 @@ public void Update()
     public override void Hide()
     {
         _contextMenu?.Close();
-
-        // dont hide window if we are dragging something
-        if (Items.Any(c => c.IconImage == DragAndDrop.CurrentPackage?.DrawControl))
-        {
-            return;
-        }
-
         base.Hide();
     }
 }

Intersect.Client.Core/Interface/Game/Hotbar/HotBarWindow.cs

@@ -1,9 +1,7 @@
 using Intersect.Client.Core;
 using Intersect.Client.Framework.File_Management;
-using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Gwen;
 using Intersect.Client.Framework.Gwen.Control;
-using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.General;
 
 namespace Intersect.Client.Interface.Game.Hotbar;
@@ -50,15 +48,4 @@ public void Update()
             slot.Update();
         }
     }
-
-    public override void Hide()
-    {
-        // dont hide window if we are dragging something
-        if (Items.Any(c => c.IconImage == DragAndDrop.CurrentPackage?.DrawControl))
-        {
-            return;
-        }
-
-        base.Hide();
-    }
 }

Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs

@@ -134,6 +134,11 @@ public void Activate()
             return;
         }
 
+        if (DragAndDrop.IsDragging)
+        {
+            return;
+        }
+
         if (_currentId != Guid.Empty && Globals.Me != null)
         {
             if (_currentItem != null)

Intersect.Client.Core/Interface/Game/Inventory/InventoryWindow.cs

@@ -2,7 +2,6 @@
 using Intersect.Client.Framework.File_Management;
 using Intersect.Client.Framework.Gwen;
 using Intersect.Client.Framework.Gwen.Control;
-using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.General;
 using Intersect.Client.Localization;
 using Intersect.Client.Utilities;
@@ -97,13 +96,6 @@ public override void Hide()
         }
 
         _contextMenu?.Close();
-
-        // dont hide window if we are dragging something
-        if (Items.Any(c => c.IconImage == DragAndDrop.CurrentPackage?.DrawControl))
-        {
-            return;
-        }
-
         base.Hide();
     }
 }

Intersect.Client.Core/Interface/Game/Spells/SpellsWindow.cs

@@ -2,7 +2,6 @@
 using Intersect.Client.Framework.File_Management;
 using Intersect.Client.Framework.Gwen;
 using Intersect.Client.Framework.Gwen.Control;
-using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.Localization;
 using Intersect.Client.Utilities;
 
@@ -74,13 +73,6 @@ private void InitItemContainer()
     public override void Hide()
     {
         _contextMenu?.Close();
-
-        // dont hide window if we are dragging something
-        if (Items.Any(c => c.IconImage == DragAndDrop.CurrentPackage?.DrawControl))
-        {
-            return;
-        }
-
         base.Hide();
     }
 }

Intersect.Client.Framework/Input/ControlBinding.cs

@@ -1,4 +1,5 @@
 using Intersect.Client.Framework.GenericClasses;
+using Intersect.Client.Framework.Gwen.DragDrop;
 using Newtonsoft.Json;
 
 namespace Intersect.Client.Framework.Input;
@@ -34,7 +35,7 @@ public bool IsDown()
 
         if (IsMouseKey && Key.TryGetMouseButton(out var mouseButton))
         {
-            return gameInput.IsMouseButtonDown(mouseButton);
+            return gameInput.IsMouseButtonDown(mouseButton) && !DragAndDrop.IsDragging;
         }
 
         return gameInput.IsKeyDown(Key);