summaryrefslogtreecommitdiff
path: root/src/gui/widgets/dropshortcutcontainer.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-06-02 22:14:54 +0300
committerAndrei Karas <akaras@inbox.ru>2013-06-02 22:14:54 +0300
commit65b614a0d142e229206fbde22a25f4a3b20b1dbc (patch)
treecb1f90dbbc8aedd3ef2dd7e2269a08b115d9fc7b /src/gui/widgets/dropshortcutcontainer.cpp
parentbead0d26642bbc0c5e570306c226676c66d18b86 (diff)
downloadmanaverse-65b614a0d142e229206fbde22a25f4a3b20b1dbc.tar.gz
manaverse-65b614a0d142e229206fbde22a25f4a3b20b1dbc.tar.bz2
manaverse-65b614a0d142e229206fbde22a25f4a3b20b1dbc.tar.xz
manaverse-65b614a0d142e229206fbde22a25f4a3b20b1dbc.zip
In drag and drop use ints and images but not pointer to item.
Diffstat (limited to 'src/gui/widgets/dropshortcutcontainer.cpp')
-rw-r--r--src/gui/widgets/dropshortcutcontainer.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 2a65a57c1..ac2916c1d 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -214,11 +214,10 @@ void DropShortcutContainer::mousePressed(gcn::MouseEvent &event)
}
else
{
- Item *const selected = dragDrop.getSelected();
- if (selected)
+ if (dragDrop.isSelected())
{
- dropShortcut->setItems(index, selected->getId(),
- selected->getColor());
+ dropShortcut->setItems(index, dragDrop.getSelected(),
+ dragDrop.getSelectedColor());
dragDrop.deselect();
}
}
@@ -255,13 +254,10 @@ void DropShortcutContainer::mouseReleased(gcn::MouseEvent &event)
}
if (!dragDrop.isEmpty())
{
- Item *const item = dragDrop.getItem();
- if (item)
- {
- dropShortcut->setItems(index, item->getId(), item->getColor());
- dragDrop.clear();
- dragDrop.deselect();
- }
+ dropShortcut->setItems(index, dragDrop.getItem(),
+ dragDrop.getItemColor());
+ dragDrop.clear();
+ dragDrop.deselect();
}
mItemClicked = false;