diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-07-03 18:41:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-07-03 18:41:44 +0300 |
| commit | 0b44672a83c505d0e073ba095e2283e60a4016ce (patch) | |
| tree | 069aaedc8f106b10b5543c7609e7273162a178eb | |
| parent | 3e7c8e44bdba6bf7a585bb40e9e75cef81caecb7 (diff) | |
| download | plus-0b44672a83c505d0e073ba095e2283e60a4016ce.tar.gz plus-0b44672a83c505d0e073ba095e2283e60a4016ce.tar.bz2 plus-0b44672a83c505d0e073ba095e2283e60a4016ce.tar.xz plus-0b44672a83c505d0e073ba095e2283e60a4016ce.zip | |
simplify drag and drop source check.
| -rw-r--r-- | src/dragdrop.h | 22 | ||||
| -rw-r--r-- | src/gui/outfitwindow.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/dropshortcutcontainer.cpp | 5 |
3 files changed, 19 insertions, 13 deletions
diff --git a/src/dragdrop.h b/src/dragdrop.h index 3c7167aaf..e58263cc9 100644 --- a/src/dragdrop.h +++ b/src/dragdrop.h @@ -207,28 +207,40 @@ class DragDrop mSelItemColor = 1; } - int getSelected() + int getSelected() const { return mSelItem; } - int getSelectedColor() + int getSelectedColor() const { return mSelItemColor; } - bool isSelected() + bool isSelected() const { return mSelItem > 0; } void clearItem(const Item *const item A_UNUSED) { } - const std::string &getText() + const std::string &getText() const { return mText; } - int getTag() + int getTag() const { return mTag; } void setItem(const int item) { mItem = item; } + bool isSourceItemContainer() const + { + return mSource == DRAGDROP_SOURCE_INVENTORY + || mSource == DRAGDROP_SOURCE_STORAGE + || mSource == DRAGDROP_SOURCE_CART + || mSource == DRAGDROP_SOURCE_TRADE + || mSource == DRAGDROP_SOURCE_OUTFIT + || mSource == DRAGDROP_SOURCE_GROUND + || mSource == DRAGDROP_SOURCE_DROP + || mSource == DRAGDROP_SOURCE_CRAFT; + } + private: int mItem; uint8_t mItemColor; diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index a95d6fe2f..e1c36fd90 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -473,10 +473,7 @@ void OutfitWindow::mouseReleased(gcn::MouseEvent &event) event.consume(); if (!dragDrop.isEmpty()) { - DragDropSource src = dragDrop.getSource(); - if (src == DRAGDROP_SOURCE_INVENTORY - || src == DRAGDROP_SOURCE_OUTFIT - || src == DRAGDROP_SOURCE_DROP) + if (dragDrop.isSourceItemContainer()) { mItems[mCurrentOutfit][index] = dragDrop.getItem(); mItemColors[mCurrentOutfit][index] = dragDrop.getItemColor(); diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index f74db990b..e26183116 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -254,10 +254,7 @@ void DropShortcutContainer::mouseReleased(gcn::MouseEvent &event) } if (!dragDrop.isEmpty()) { - DragDropSource src = dragDrop.getSource(); - if (src == DRAGDROP_SOURCE_INVENTORY - || src == DRAGDROP_SOURCE_OUTFIT - || src == DRAGDROP_SOURCE_DROP) + if (dragDrop.isSourceItemContainer()) { dropShortcut->setItems(index, dragDrop.getItem(), dragDrop.getItemColor()); |