summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-09 18:17:50 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-09 18:17:50 +0300
commit4aeceabb5d4f00e2555234951a2f5db24b008265 (patch)
tree16e970611e7cc05352f18a9385b9e26c72d498d8 /src/gui/viewport.cpp
parentdd4d44a07d3a63ced0eec51c30b75887792c4a36 (diff)
downloadplus-4aeceabb5d4f00e2555234951a2f5db24b008265.tar.gz
plus-4aeceabb5d4f00e2555234951a2f5db24b008265.tar.bz2
plus-4aeceabb5d4f00e2555234951a2f5db24b008265.tar.xz
plus-4aeceabb5d4f00e2555234951a2f5db24b008265.zip
Improve perfomance in windows and popups visibility checks.
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e7e0a2766..c8b0a0c8b 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -468,7 +468,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
}
// If a popup is active, just remove it
- if (mPopupMenu->isVisible())
+ if (mPopupMenu->isPopupVisible())
{
mPlayerFollowMouse = false;
mPopupMenu->setVisible(false);
@@ -895,7 +895,7 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
}
else
{
- if (mTextPopup->isVisible())
+ if (mTextPopup->isPopupVisible())
mTextPopup->setVisible(false);
}
gui->setCursorType(Cursor::CURSOR_UP);
@@ -903,7 +903,7 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
}
}
}
- if (mTextPopup->isVisible())
+ if (mTextPopup->isPopupVisible())
mTextPopup->setVisible(false);
if (mHoverBeing)
@@ -998,7 +998,7 @@ void Viewport::moveCamera(const int dx, const int dy)
bool Viewport::isPopupMenuVisible() const
{
- return mPopupMenu ? mPopupMenu->isVisible() : false;
+ return mPopupMenu ? mPopupMenu->isPopupVisible() : false;
}
void Viewport::moveCameraToActor(const int actorId, const int x, const int y)