From 6f5b826b89f6a481d358e02dd45a3da8209aadee Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 18 Oct 2014 00:22:33 +0300
Subject: Dont hide text popup if mouse event already consumed.

---
 src/gui/viewport.cpp       | 4 ++--
 src/gui/widgets/window.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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();
-- 
cgit v1.2.3-70-g09d2