diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-04-15 13:10:38 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-15 13:10:38 -0600 |
| commit | e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701 (patch) | |
| tree | 6c9218f32675f9d401301172869c30488ab08b16 /src/gui/viewport.cpp | |
| parent | 56c224050f10d976298cef98607aa3b3e56fcc99 (diff) | |
| parent | 3d85a00ff2a33e22ba63d0b7dfc156d8076933e1 (diff) | |
| download | mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.gz mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.bz2 mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.xz mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/viewport.cpp')
| -rw-r--r-- | src/gui/viewport.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 3fc5f2d4..9ce537fc 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -313,8 +313,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event) if ((being = beingManager->findBeingByPixel(pixelx, pixely)) && being != player_node) { - mPopupMenu->showPopup(event.getX(), event.getY(), being); - return; + mPopupMenu->showPopup(event.getX(), event.getY(), being); + return; } else if ((floorItem = floorItemManager->findByCoordinates(tilex, tiley))) @@ -446,6 +446,11 @@ void Viewport::showPopup(int x, int y, Item *item) mPopupMenu->showPopup(x, y, item); } +void Viewport::closePopupMenu() +{ + mPopupMenu->handleLink("cancel"); +} + void Viewport::optionChanged(const std::string &name) { mScrollLaziness = (int) config.getValue("ScrollLaziness", 32); |