Merge branch 'Applications/16.08'

[dolphin.git] / src / kitemviews / kitemlistcontainer.cpp

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 94b49dbdeca96da4aac42f8dadb8f3535b0ff82d..6974ebb483ca55c5c678095686858f1a02cfb762 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -43,6 +43,8 @@
  */
 class KItemListContainerViewport : public QGraphicsView
 {
+    Q_OBJECT
+
 public:
     KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
 protected:
@@ -183,27 +185,7 @@ void KItemListContainer::wheelEvent(QWheelEvent* event)
     KItemListSmoothScroller* smoothScroller = scrollHorizontally ?
                                               m_horizontalSmoothScroller : m_verticalSmoothScroller;
 
-    const QScrollBar* scrollBar = smoothScroller->scrollBar();
-    if (!event->pixelDelta().isNull()) {
-        const int numPixels =  event->pixelDelta().y();
-        if (event->modifiers().testFlag(Qt::ShiftModifier)) {
-            const int scrollingDirection = numPixels > 0 ? 1 : -1;
-            smoothScroller->scrollTo(scrollBar->value() - scrollBar->pageStep() * scrollingDirection);
-        } else {
-            smoothScroller->scrollTo(scrollBar->value() - numPixels);
-        }
-    } else {
-        const int numDegrees = event->angleDelta().y() / 8;
-        const int numSteps = qApp->wheelScrollLines() * numDegrees / 15;
-        if (event->modifiers().testFlag(Qt::ShiftModifier)) {
-            const int scrollingDirection = numSteps > 0 ? 1 : -1;
-            smoothScroller->scrollTo(scrollBar->value() - scrollBar->pageStep() * scrollingDirection);
-        } else {
-            smoothScroller->scrollTo(scrollBar->value() - numSteps * scrollBar->pageStep() / 12);
-        }
-    }
-
-    event->accept();
+    smoothScroller->handleWheelEvent(event);
 }
 
 void KItemListContainer::slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
@@ -425,3 +407,4 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
     }
 }
 
+#include "kitemlistcontainer.moc"