diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-17 13:40:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-17 13:40:14 +0300 |
| commit | 2cb9f5c3d47077a459fabf15800b1c45cfdacb3a (patch) | |
| tree | ad6eba1142495acd31dc8a50b56988a26350f2d5 /src/gui/widgets/itemshortcutcontainer.cpp | |
| parent | 829cd57e021ea85cffdbd3f3a7b18da835e00b7c (diff) | |
| download | manaplus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.gz manaplus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.bz2 manaplus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.xz manaplus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.zip | |
Remove proxy methods used for access popup menu.
Diffstat (limited to 'src/gui/widgets/itemshortcutcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 2d8deeba9..84b7bc249 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -39,6 +39,7 @@ #include "gui/fonts/font.h" #include "gui/popups/itempopup.h" +#include "gui/popups/popupmenu.h" #include "gui/popups/spellpopup.h" #include "gui/windows/inventorywindow.h" @@ -334,9 +335,11 @@ void ItemShortcutContainer::mousePressed(MouseEvent &event) else if (event.getButton() == MouseButton::RIGHT) { event.consume(); - if (popupManager && selShortcut) + if (popupMenu && selShortcut && viewport) { - popupManager->showItemPopup(selShortcut->getItem(index), + popupMenu->showItemPopup(viewport->getMouseX(), + viewport->getMouseY(), + selShortcut->getItem(index), selShortcut->getItemColor(index)); } } |