summaryrefslogtreecommitdiff
path: root/src/gui/outfitwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-03 16:00:30 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-03 16:00:30 +0300
commit7f8fd01cdd56b322c19e58c19d483fb32fb05cb5 (patch)
tree0330b2853c3a5222ca6aea2d8d4c769ac47a2e31 /src/gui/outfitwindow.cpp
parent2eb15d389f85e300cb124b990ebbf2663acaa637 (diff)
downloadplus-7f8fd01cdd56b322c19e58c19d483fb32fb05cb5.tar.gz
plus-7f8fd01cdd56b322c19e58c19d483fb32fb05cb5.tar.bz2
plus-7f8fd01cdd56b322c19e58c19d483fb32fb05cb5.tar.xz
plus-7f8fd01cdd56b322c19e58c19d483fb32fb05cb5.zip
fix drag and drop inside some windows.
Diffstat (limited to 'src/gui/outfitwindow.cpp')
-rw-r--r--src/gui/outfitwindow.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index d14abd701..a95d6fe2f 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -471,13 +471,18 @@ void OutfitWindow::mouseReleased(gcn::MouseEvent &event)
}
mMoved = false;
event.consume();
- if (!dragDrop.isEmpty() && dragDrop.getSource()
- == DRAGDROP_SOURCE_INVENTORY)
+ if (!dragDrop.isEmpty())
{
- mItems[mCurrentOutfit][index] = dragDrop.getItem();
- mItemColors[mCurrentOutfit][index] = dragDrop.getItemColor();
- dragDrop.clear();
- dragDrop.deselect();
+ DragDropSource src = dragDrop.getSource();
+ if (src == DRAGDROP_SOURCE_INVENTORY
+ || src == DRAGDROP_SOURCE_OUTFIT
+ || src == DRAGDROP_SOURCE_DROP)
+ {
+ mItems[mCurrentOutfit][index] = dragDrop.getItem();
+ mItemColors[mCurrentOutfit][index] = dragDrop.getItemColor();
+ dragDrop.clear();
+ dragDrop.deselect();
+ }
}
if (mItemClicked)
mItemClicked = false;