summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.cpp
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-08-14 22:25:54 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-08-14 22:25:54 +0000
commit8e1c3b592c9ebcec9e006bcc54eea55bfea4a864 (patch)
tree134de69274dad771a4cd9297a0a0617ed28a0543 /src/gui/popupmenu.cpp
parent0ce6e9e8400c326e6848688b3b865c84d96e3073 (diff)
downloadmana-client-8e1c3b592c9ebcec9e006bcc54eea55bfea4a864.tar.gz
mana-client-8e1c3b592c9ebcec9e006bcc54eea55bfea4a864.tar.bz2
mana-client-8e1c3b592c9ebcec9e006bcc54eea55bfea4a864.tar.xz
mana-client-8e1c3b592c9ebcec9e006bcc54eea55bfea4a864.zip
Removed guiGraphics global pointer and removed dependencies on gui.h in some places.
Diffstat (limited to 'src/gui/popupmenu.cpp')
-rw-r--r--src/gui/popupmenu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 17ca9edb..a5a6128b 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -29,9 +29,9 @@
#include <guichan/focushandler.hpp>
#include "browserbox.h"
-#include "gui.h"
#include "inventorywindow.h"
#include "item_amount.h"
+#include "windowcontainer.h"
#include "../being.h"
#include "../floor_item.h"
@@ -254,9 +254,9 @@ void PopupMenu::showPopup(int x, int y, Item *item)
void PopupMenu::showPopup(int x, int y)
{
setContentSize(browserBox->getWidth() + 8, browserBox->getHeight() + 8);
- if (guiGraphics->getWidth() < (x + getWidth() + 5))
+ if (windowContainer->getWidth() < (x + getWidth() + 5))
x -= (getWidth() + 50);
- if (guiGraphics->getHeight() < (y + getHeight() + 5))
+ if (windowContainer->getHeight() < (y + getHeight() + 5))
y -= (getHeight() + 50);
setPosition(x, y);
setVisible(true);