hide details when dragging slot items

Author: WeylonSantana

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

@@ -211,8 +211,7 @@ public override void Update()
         var bagSlot = bagSlots[SlotIndex];
         var descriptor = bagSlot.Descriptor;
 
-        //TODO: dont show when is dragging
-        _quantityLabel.IsVisibleInParent = descriptor.IsStackable && bagSlot.Quantity > 1;
+        _quantityLabel.IsVisibleInParent = !IconImage.IsDragging && descriptor.IsStackable && bagSlot.Quantity > 1;
         if (_quantityLabel.IsVisibleInParent)
         {
             _quantityLabel.Text = Strings.FormatQuantityAbbreviated(bagSlot.Quantity);

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

@@ -276,8 +276,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
         var bankSlot = bankSlots[SlotIndex];
         var descriptor = bankSlot.Descriptor;
 
-        //TODO: dont show when is dragging
-        _quantityLabel.IsVisibleInParent = descriptor.IsStackable && bankSlot.Quantity > 1;
+        _quantityLabel.IsVisibleInParent = !IconImage.IsDragging && descriptor.IsStackable && bankSlot.Quantity > 1;
         if (_quantityLabel.IsVisibleInParent)
         {
             _quantityLabel.Text = Strings.FormatQuantityAbbreviated(bankSlot.Quantity);

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

@@ -8,6 +8,8 @@ public partial class Draggable(Base parent, string name) : ImagePanel(parent, na
 {
     public bool DisableDragAndDrop { get; set; } = false;
 
+    public bool IsDragging => DragAndDrop.CurrentPackage?.DrawControl == this;
+
     public override bool DragAndDrop_Draggable()
     {
         return true;

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

@@ -9,8 +9,6 @@
 using Intersect.Client.Framework.Input;
 using Intersect.Client.General;
 using Intersect.Client.Interface.Game.DescriptionWindows;
-using Intersect.Client.Interface.Game.Inventory;
-using Intersect.Client.Interface.Game.Spells;
 using Intersect.Client.Items;
 using Intersect.Client.Localization;
 using Intersect.Client.Spells;
@@ -395,11 +393,25 @@ public void Update()
             }
         }
 
+        var isDragging = IconImage.IsDragging;
+        if (isDragging)
+        {
+            _equipLabel.IsHidden = true;
+            _quantityLabel.IsHidden = true;
+            _cooldownLabel.IsHidden = true;
+        }
+        else
+        {
+            _equipLabel.IsHidden = !_isEquipped || _inventoryItemIndex < 0;
+            _quantityLabel.IsHidden = _currentItem?.Stackable == false || _inventoryItemIndex < 0;
+            _cooldownLabel.IsHidden = !_isFaded || _inventoryItemIndex < 0;
+        }
+
         if (updateDisplay) //Item on cd and fade is incorrect
         {
             if (_currentItem != null)
             {
-                IconImage.Show();
+                IconImage.IsVisibleInTree = !isDragging;
                 IconImage.Texture = Globals.ContentManager.GetTexture(
                     Framework.Content.TextureType.Item, _currentItem.Icon
                 );
@@ -413,7 +425,7 @@ public void Update()
                     _isFaded = Globals.Me.IsItemOnCooldown(_inventoryItemIndex);
                     _isEquipped = Globals.Me.IsEquipped(_inventoryItemIndex);
 
-                    if (_isFaded)
+                    if (_isFaded && !isDragging)
                     {
                         _cooldownLabel.IsHidden = false;
                         _cooldownLabel.Text = TimeSpan
@@ -430,15 +442,11 @@ public void Update()
                     _isFaded = true;
                 }
 
-                _equipLabel.IsHidden = !_isEquipped || _inventoryItemIndex < 0;
-                _quantityLabel.IsHidden = !_currentItem.Stackable || _inventoryItemIndex < 0;
-                _cooldownLabel.IsHidden = !_isFaded || _inventoryItemIndex < 0;
-
                 _textureLoaded = true;
             }
             else if (_currentSpell != null)
             {
-                IconImage.Show();
+                IconImage.IsVisibleInTree = !isDragging;
                 IconImage.Texture = Globals.ContentManager.GetTexture(
                     Framework.Content.TextureType.Spell, _currentSpell.Icon
                 );
@@ -450,7 +458,7 @@ public void Update()
                 {
                     var spellSlot = Globals.Me.FindHotbarSpell(slot);
                     _isFaded = Globals.Me.IsSpellOnCooldown(spellSlot);
-                    if (_isFaded)
+                    if (_isFaded && !isDragging)
                     {
                         _cooldownLabel.IsHidden = false;
                         var remaining = Globals.Me.GetSpellRemainingCooldown(spellSlot);

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

@@ -1,7 +1,6 @@
 using Intersect.Client.Core;
 using Intersect.Client.Entities;
 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.Control.EventArguments;
@@ -515,20 +514,17 @@ public override void Update()
         }
 
         var equipped = Globals.Me.MyEquipment.Any(s => s == SlotIndex);
-        //Todo: hide when dragging
-        _equipImageBackground.IsVisibleInParent = equipped;
-        //Todo: hide when dragging
-        _equipLabel.IsVisibleInParent = equipped;
+        var isDragging = IconImage.IsDragging;
+        _equipImageBackground.IsVisibleInParent = !isDragging && equipped;
+        _equipLabel.IsVisibleInParent = !isDragging && equipped;
 
-        //Todo: hide when dragging
-        _quantityLabel.IsVisibleInParent = descriptor.IsStackable && inventorySlot.Quantity > 1;
+        _quantityLabel.IsVisibleInParent = !isDragging && descriptor.IsStackable && inventorySlot.Quantity > 1;
         if (_quantityLabel.IsVisibleInParent)
         {
             _quantityLabel.Text = Strings.FormatQuantityAbbreviated(inventorySlot.Quantity);
         }
 
-        //Todo: hide when dragging
-        _cooldownLabel.IsVisibleInParent = Globals.Me.IsItemOnCooldown(SlotIndex);
+        _cooldownLabel.IsVisibleInParent = !isDragging && Globals.Me.IsItemOnCooldown(SlotIndex);
         if (_cooldownLabel.IsVisibleInParent)
         {
             var itemCooldownRemaining = Globals.Me.GetItemRemainingCooldown(SlotIndex);

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

@@ -213,8 +213,7 @@ public override void Update()
             return;
         }
 
-        //TODO: dont show when is dragging
-        _cooldownLabel.IsVisibleInParent = Globals.Me.IsSpellOnCooldown(SlotIndex);
+        _cooldownLabel.IsVisibleInParent = !IconImage.IsDragging && Globals.Me.IsSpellOnCooldown(SlotIndex);
         if (_cooldownLabel.IsVisibleInParent)
         {
             var itemCooldownRemaining = Globals.Me.GetSpellRemainingCooldown(SlotIndex);