From 2b0936e4eafee4da5e2ff3c0a7b7fd0df8a9f5c4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 20 Aug 2015 19:02:40 +0300 Subject: Add ability for insert cards into items by dragging. --- src/gui/widgets/itemcontainer.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/gui/widgets/itemcontainer.cpp') 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) { -- cgit v1.2.3-60-g2f50