Ensure Paperdoll is not click/dragged when an inventory item is dragg…

…ed over it
ethanmoffat · Apr 1, 2022 · 14188b3 · 14188b3
1 parent 769fa69
commit 14188b3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/EndlessClient/Dialogs/Factories/PaperdollDialogFactory.cs b/EndlessClient/Dialogs/Factories/PaperdollDialogFactory.cs
@@ -1,5 +1,6 @@
 using AutomaticTypeMapper;
 using EndlessClient.Controllers;
+using EndlessClient.ControlSets;
 using EndlessClient.Dialogs.Services;
 using EndlessClient.GameExecution;
 using EndlessClient.HUD;
@@ -20,20 +21,23 @@ public class PaperdollDialogFactory : IPaperdollDialogFactory
         private readonly IStatusLabelSetter _statusLabelSetter;
         private readonly IPaperdollProvider _paperdollProvider;
         private readonly IPubFileProvider _pubFileProvider;
+        private readonly IHudControlProvider _hudControlProvider;
         private readonly INativeGraphicsManager _nativeGraphicsManager;
         private IInventoryController _inventoryController;
 
         public PaperdollDialogFactory(IGameStateProvider gameStateProvider,
             INativeGraphicsManager nativeGraphicsManager,
             IPaperdollProvider paperdollProvider,
             IPubFileProvider pubFileProvider,
+            IHudControlProvider hudControlProvider,
             IEODialogButtonService eoDialogButtonService,
             IInventorySpaceValidator inventorySpaceValidator,
             IEOMessageBoxFactory eoMessageBoxFactory,
             IStatusLabelSetter statusLabelSetter)
         {
             _paperdollProvider = paperdollProvider;
             _pubFileProvider = pubFileProvider;
+            _hudControlProvider = hudControlProvider;
             _nativeGraphicsManager = nativeGraphicsManager;
             _gameStateProvider = gameStateProvider;
             _eoDialogButtonService = eoDialogButtonService;
@@ -49,6 +53,7 @@ public PaperdollDialog Create(ICharacter character, bool isMainCharacter)
                 _inventoryController,
                 _paperdollProvider,
                 _pubFileProvider,
+                _hudControlProvider,
                 _eoDialogButtonService,
                 _inventorySpaceValidator,
                 _eoMessageBoxFactory,

diff --git a/EndlessClient/Dialogs/PaperdollDialog.cs b/EndlessClient/Dialogs/PaperdollDialog.cs
@@ -1,9 +1,11 @@
 using EndlessClient.Controllers;
+using EndlessClient.ControlSets;
 using EndlessClient.Dialogs.Factories;
 using EndlessClient.Dialogs.Services;
 using EndlessClient.GameExecution;
 using EndlessClient.HUD;
 using EndlessClient.HUD.Inventory;
+using EndlessClient.HUD.Panels;
 using EOLib;
 using EOLib.Domain.Character;
 using EOLib.Domain.Online;
@@ -30,6 +32,7 @@ public class PaperdollDialog : BaseEODialog
         private readonly IInventoryController _inventoryController;
         private readonly IPaperdollProvider _paperdollProvider;
         private readonly IPubFileProvider _pubFileProvider;
+        private readonly IHudControlProvider _hudControlProvider;
         private readonly IInventorySpaceValidator _inventorySpaceValidator;
         private readonly IEOMessageBoxFactory _eoMessageBoxFactory;
         private readonly IStatusLabelSetter _statusLabelSetter;
@@ -55,6 +58,7 @@ public PaperdollDialog(IGameStateProvider gameStateProvider,
                                IInventoryController inventoryController,
                                IPaperdollProvider paperdollProvider,
                                IPubFileProvider pubFileProvider,
+                               IHudControlProvider hudControlProvider,
                                IEODialogButtonService eoDialogButtonService,
                                IInventorySpaceValidator inventorySpaceValidator,
                                IEOMessageBoxFactory eoMessageBoxFactory,
@@ -64,6 +68,7 @@ public PaperdollDialog(IGameStateProvider gameStateProvider,
         {
             _paperdollProvider = paperdollProvider;
             _pubFileProvider = pubFileProvider;
+            _hudControlProvider = hudControlProvider;
             _inventorySpaceValidator = inventorySpaceValidator;
             _eoMessageBoxFactory = eoMessageBoxFactory;
             _statusLabelSetter = statusLabelSetter;
@@ -125,8 +130,6 @@ public PaperdollDialog(IGameStateProvider gameStateProvider,
 
         protected override void OnUpdateControl(GameTime gameTime)
         {
-            base.OnUpdateControl(gameTime);
-
             _paperdollData = _paperdollData.FlatMap(paperdollData =>
                 paperdollData.NoneWhen(d => _paperdollProvider.VisibleCharacterPaperdolls.ContainsKey(Character.ID) &&
                                            !_paperdollProvider.VisibleCharacterPaperdolls[Character.ID].Equals(d)));
@@ -141,19 +144,9 @@ protected override void OnUpdateControl(GameTime gameTime)
                     }
                 });
 
-            // todo: dragging to equip/unequip from inventory
-            /*
-            if (EOGame.Instance.Hud.IsInventoryDragging())
-            {
-                shouldClickDrag = false;
-                SuppressParentClickDrag(true);
-            }
-            else
-            {
-                shouldClickDrag = true;
-                SuppressParentClickDrag(false);
-            }
-            */
+            SuppressClickDragEvent(!_hudControlProvider.GetComponent<InventoryPanel>(HUD.Controls.HudControlIdentifier.InventoryPanel).NoItemsDragging());
+
+            base.OnUpdateControl(gameTime);
         }
 
         protected override void OnDrawControl(GameTime gameTime)

diff --git a/EndlessClient/EndlessClient.csproj b/EndlessClient/EndlessClient.csproj
@@ -60,6 +60,6 @@
     <PackageReference Include="Monogame.Content.Builder.Task" Version="3.8.0.1641" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
-    <PackageReference Include="XNAControls" Version="1.3.3" />
+    <PackageReference Include="XNAControls" Version="1.3.4" />
   </ItemGroup>
 </Project>
diff --git a/EndlessClient/HUD/Panels/InventoryPanel.cs b/EndlessClient/HUD/Panels/InventoryPanel.cs
@@ -117,7 +117,7 @@ public InventoryPanel(INativeGraphicsManager nativeGraphicsManager,
             Game.Exiting += SaveInventoryFile;
         }
 
-        public bool NoItemsDragging() => _childItems.All(x => !x.IsDragging);
+        public bool NoItemsDragging() => !_childItems.Any(x => x.IsDragging);
 
         public override void Initialize()
         {