Don't block unmounting when terminal panel's cwd is the mountpoint

[dolphin.git] / src / kitemviews / private / kitemlistsmoothscroller.cpp

diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index c89d3cf8f8d64d9e9f33d805b1b28764bd8ae573..6bfdba4c9ae5fbd911716e96c136685e7a5ee22e 100644 (file)
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -172,8 +172,7 @@ bool KItemListSmoothScroller::eventFilter(QObject* obj, QEvent* event)
         break;
 
     case QEvent::Wheel:
         break;
 
     case QEvent::Wheel:

-        handleWheelEvent(static_cast<QWheelEvent*>(event));
-        return true; // eat event so that QScrollBar does not scroll one step more by itself
+        return false; // we're the ones sending them

 
     default:
         break;
 
     default:
         break;


@@ -196,25 +195,11 @@ void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event)
     const bool previous = m_smoothScrolling;
 
     m_smoothScrolling = true;
     const bool previous = m_smoothScrolling;
 
     m_smoothScrolling = true;

-    int numPixels;
-    if (!event->pixelDelta().isNull()) {
-        numPixels = event->pixelDelta().y();
-    } else {
-        const int numDegrees = event->angleDelta().y() / 8;
-        const int numSteps = qApp->wheelScrollLines() * numDegrees / 15;
-        numPixels = numSteps * m_scrollBar->pageStep() / 12;
-    }
-    int value = m_scrollBar->value();
-    if (event->modifiers().testFlag(Qt::ShiftModifier)) {
-        const int scrollingDirection = numPixels > 0 ? 1 : -1;
-        value -= m_scrollBar->pageStep() * scrollingDirection;
-    } else {
-        value -= numPixels;
-    }
-    m_scrollBar->setValue(value);

 
 

-    m_smoothScrolling = previous;
+    QWheelEvent copy = *event;
+    QApplication::sendEvent(m_scrollBar, &copy);
+    event->setAccepted(copy.isAccepted());

 
 

-    event->accept();
+    m_smoothScrolling = previous;

 }
 
 }