dont let player do some actions when is dragging

Author: WeylonSantana

Intersect.Client.Core/Core/Input.cs

@@ -2,6 +2,7 @@
 using Intersect.Client.Entities;
 using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
+using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.Framework.Gwen.Input;
 using Intersect.Client.Framework.Input;
 using Intersect.Client.General;
@@ -138,6 +139,11 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                 return;
             }
 
+            if (DragAndDrop.IsDragging)
+            {
+                return;
+            }
+
             var gameUi = Interface.Interface.GameUi;
 
             // First try and unfocus chat then close all UI elements, then untarget our target.. and THEN open the escape menu.
@@ -196,7 +202,7 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                     break;
 
                 case Control.ToggleGui:
-                    if (currentGameState == GameStates.InGame)
+                    if (currentGameState == GameStates.InGame && !DragAndDrop.IsDragging)
                     {
                         Interface.Interface.HideUi = !Interface.Interface.HideUi;
                     }

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

@@ -3,6 +3,7 @@
 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;
@@ -65,12 +66,6 @@ private void InitItemContainer()
         PopulateSlotContainer.Populate(_slotContainer, Items);
     }
 
-    public override void Hide()
-    {
-        _contextMenu?.Close();
-        base.Hide();
-    }
-
     public void Update()
     {
         if (IsVisibleInTree == false)
@@ -86,4 +81,17 @@ 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

@@ -1,8 +1,8 @@
 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;
@@ -89,4 +89,17 @@ 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

@@ -3,6 +3,7 @@
 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;
@@ -49,4 +50,15 @@ 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/Inventory/InventoryWindow.cs

@@ -1,8 +1,8 @@
 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;
@@ -97,6 +97,13 @@ 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

@@ -1,8 +1,8 @@
 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.Localization;
 using Intersect.Client.Utilities;
 
@@ -74,6 +74,13 @@ 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();
     }
 }