Add ability for insert cards into items by dragging.

1 files changed, 13 insertions, 0 deletions

diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index e728cb3a4..b533aadd3 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -36,6 +36,7 @@
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/chatwindow.h"
+#include "gui/windows/inventorywindow.h"
 #include "gui/windows/shopwindow.h"
 #include "gui/windows/shortcutwindow.h"
 
@@ -579,6 +580,18 @@ void ItemContainer::mouseReleased(MouseEvent &event)
             dstContainer = InventoryType::CART;
             inventory = PlayerInfo::getInventory();
         }
+        if (src == DRAGDROP_SOURCE_INVENTORY
+            && dst == DRAGDROP_SOURCE_INVENTORY)
+        {
+            const int index = getSlotIndex(event.getX(), event.getY());
+            if (index == Inventory::NO_SLOT_INDEX)
+                return;
+            if (index == mSelectedIndex || mSelectedIndex == -1)
+                return;
+            if (inventoryWindow)
+                inventoryWindow->combineItems(index, mSelectedIndex);
+            return;
+        }
         else if (src == DRAGDROP_SOURCE_CART
                  && dst == DRAGDROP_SOURCE_INVENTORY)
         {