Load KFileItemAction plugins with json metadata

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

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index c9d521ce788fabab56ea6ca943a14174bee9bc14..69a0a5f27999d7f48a5b886d4b583470c2bb1508 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -43,6 +43,8 @@
  */
 class KItemListContainerViewport : public QGraphicsView
 {
  */
 class KItemListContainerViewport : public QGraphicsView
 {

+    Q_OBJECT
+

 public:
     KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
 protected:
 public:
     KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
 protected:


@@ -194,12 +196,12 @@ void KItemListContainer::wheelEvent(QWheelEvent* event)
         }
     } else {
         const int numDegrees = event->angleDelta().y() / 8;
         }
     } else {
         const int numDegrees = event->angleDelta().y() / 8;

-        const int numSteps = numDegrees / 15;
+        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 {
         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() / 4);
+            smoothScroller->scrollTo(scrollBar->value() - numSteps * scrollBar->pageStep() / 12);

         }
     }
 
         }
     }
 


@@ -425,3 +427,4 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
     }
 }
 
     }
 }
 

+#include "kitemlistcontainer.moc"