diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-09 19:43:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-09 19:43:40 +0300 |
| commit | 4484b433abc8f07bcf7d4d22fd946e00b66b078d (patch) | |
| tree | d8d04c6ea9526b90334e7b0a4abf44e2508a3597 /src/gui/widgets/popup.cpp | |
| parent | c1fb0bf9dc98e2a30f33cbbf4f74604b36efbcba (diff) | |
| download | manaplus-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.gz manaplus-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.bz2 manaplus-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.xz manaplus-4484b433abc8f07bcf7d4d22fd946e00b66b078d.zip | |
Fix first part of shadow variables/methods errors.
Diffstat (limited to 'src/gui/widgets/popup.cpp')
| -rw-r--r-- | src/gui/widgets/popup.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 38088770b..ebfdbe303 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -44,8 +44,8 @@ Popup::Popup(const std::string &name, const std::string &skin): mPopupName(name), mMinWidth(100), mMinHeight(40), - mMaxWidth(graphics->mWidth), - mMaxHeight(graphics->mHeight), + mMaxWidth(mainGraphics->mWidth), + mMaxHeight(mainGraphics->mHeight), mVertexes(new GraphicsVertexes()), mRedraw(true) { @@ -190,9 +190,9 @@ void Popup::position(int x, int y) int posX = std::max(0, x - getWidth() / 2); int posY = y + distance; - if (posX + getWidth() > graphics->mWidth) - posX = graphics->mWidth - getWidth(); - if (posY + getHeight() > graphics->mHeight) + if (posX + getWidth() > mainGraphics->mWidth) + posX = mainGraphics->mWidth - getWidth(); + if (posY + getHeight() > mainGraphics->mHeight) posY = y - getHeight() - distance; setPosition(posX, posY); |