diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-18 00:22:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-18 00:22:33 +0300 |
| commit | 6f5b826b89f6a481d358e02dd45a3da8209aadee (patch) | |
| tree | 91817adf0e0ed9ff776cfb0b03c8a7c35674eb27 /src/gui | |
| parent | 84b67aacfdedd8d526d246e3d3c0914a899d491c (diff) | |
| download | manaplus-6f5b826b89f6a481d358e02dd45a3da8209aadee.tar.gz manaplus-6f5b826b89f6a481d358e02dd45a3da8209aadee.tar.bz2 manaplus-6f5b826b89f6a481d358e02dd45a3da8209aadee.tar.xz manaplus-6f5b826b89f6a481d358e02dd45a3da8209aadee.zip | |
Dont hide text popup if mouse event already consumed.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/viewport.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/window.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index ed717af4f..6008b5e43 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -743,7 +743,7 @@ void Viewport::optionChanged(const std::string &name) mLongMouseClick = config.getBoolValue("longmouseclick"); } -void Viewport::mouseMoved(MouseEvent &event A_UNUSED) +void Viewport::mouseMoved(MouseEvent &event) { // Check if we are on the map if (!mMap || !localPlayer || !actorManager) @@ -808,7 +808,7 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED) } } } - if (popupManager->isTextPopupVisible()) + if (!event.isConsumed() && popupManager->isTextPopupVisible()) popupManager->hideTextPopup(); if (mHoverBeing) diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 5cf430821..98a435f3f 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -840,7 +840,7 @@ void Window::updateResizeHandler(MouseEvent &event) void Window::mouseMoved(MouseEvent &event) { updateResizeHandler(event); - if (popupManager) + if (popupManager && !event.isConsumed()) { popupManager->hideBeingPopup(); popupManager->hideTextPopup(); |