summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 08d2bfb91..c77232591 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -578,10 +578,10 @@ void Viewport::mousePressed(MouseEvent &event)
}
// If a popup is active, just remove it
- if (popupManager->isPopupMenuVisible())
+ if (PopupManager::isPopupMenuVisible())
{
mPlayerFollowMouse = false;
- popupManager->hidePopupMenu();
+ PopupManager::hidePopupMenu();
return;
}
@@ -940,13 +940,13 @@ void Viewport::mouseMoved(MouseEvent &event)
|| type == ActorType::Mercenary
|| type == ActorType::Pet))
{
- popupManager->hideTextPopup();
+ PopupManager::hideTextPopup();
if (mShowBeingPopup && (beingPopup != nullptr))
beingPopup->show(mMouseX, mMouseY, mHoverBeing);
}
else
{
- popupManager->hideBeingPopup();
+ PopupManager::hideBeingPopup();
}
mHoverItem = actorManager->findItem(x / mMap->getTileWidth(),
@@ -968,7 +968,7 @@ void Viewport::mouseMoved(MouseEvent &event)
{
if (!mHoverSign->getComment().empty())
{
- popupManager->hideBeingPopup();
+ PopupManager::hideBeingPopup();
if (textPopup != nullptr)
{
textPopup->show(mMouseX, mMouseY,
@@ -977,16 +977,19 @@ void Viewport::mouseMoved(MouseEvent &event)
}
else
{
- if (popupManager->isTextPopupVisible())
- popupManager->hideTextPopup();
+ if (PopupManager::isTextPopupVisible())
+ PopupManager::hideTextPopup();
}
gui->setCursorType(Cursor::CURSOR_UP);
return;
}
}
}
- if (!event.isConsumed() && popupManager->isTextPopupVisible())
- popupManager->hideTextPopup();
+ if (!event.isConsumed() &&
+ PopupManager::isTextPopupVisible())
+ {
+ PopupManager::hideTextPopup();
+ }
if (mHoverBeing != nullptr)
{