When the selection toggle is clicked and the mouse gets moved outside the selection...

BUG: 184178

svn path=/trunk/KDE/kdebase/apps/; revision=927488

diff --git a/src/selectiontoggle.cpp b/src/selectiontoggle.cpp
index b9b79def01af8f2834936e2e85909ccac59d03c7..01cfed0f3d80c49c239cb27d7c35eed9b28c87d6 100644 (file)
--- a/src/selectiontoggle.cpp
+++ b/src/selectiontoggle.cpp
@@ -89,9 +89,27 @@ void SelectionToggle::setVisible(bool visible)
 
 bool SelectionToggle::eventFilter(QObject* obj, QEvent* event)
 {
-    if ((obj == parent()) && (event->type() == QEvent::Leave)) {
-        hide();
+    if (obj == parent()) {
+        switch (event->type()) {
+        case QEvent::Leave:
+            hide();
+            break;
+
+        case QEvent::MouseMove:
+            if (m_isHovered) {
+                // Don't forward mouse move events to the viewport,
+                // otherwise a rubberband selection will be shown when
+                // clicking on the selection toggle and moving the mouse
+                // above the viewport.
+                return true;
+            }
+            break;
+
+        default:
+            break;
+        }
     }
+
     return QAbstractButton::eventFilter(obj, event);
 }