Merge branch 'release/19.12'

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

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 5e45a1766eab6aa43bc549a375e42c232dbf4361..6279b15a994baf8f0f7579f57aa47a981ccf584d 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -1,8 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *

- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
+ *   Based on the Itemviews NG project from Trolltech Labs                 *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -24,20 +23,15 @@
 
 #include "kitemlistcontroller.h"
 #include "kitemlistview.h"
 
 #include "kitemlistcontroller.h"
 #include "kitemlistview.h"

-#include "kitemmodelbase.h"
-

 #include "private/kitemlistsmoothscroller.h"
 
 #include <QApplication>
 #include "private/kitemlistsmoothscroller.h"
 
 #include <QApplication>

+#include <QFontMetrics>

 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QGraphicsView>

-#include <QPropertyAnimation>

 #include <QScrollBar>
 #include <QScrollBar>

-#include <QStyle>

 #include <QStyleOption>
 
 #include <QStyleOption>
 

-#include <KDebug>
-

 /**
  * Replaces the default viewport of KItemListContainer by a
  * non-scrollable viewport. The scrolling is done in an optimized
 /**
  * Replaces the default viewport of KItemListContainer by a
  * non-scrollable viewport. The scrolling is done in an optimized


@@ -45,10 +39,12 @@
  */
 class KItemListContainerViewport : public QGraphicsView
 {
  */
 class KItemListContainerViewport : public QGraphicsView
 {

+    Q_OBJECT
+

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

-    virtual void wheelEvent(QWheelEvent* event);
+    void wheelEvent(QWheelEvent* event) override;

 };
 
 KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) :
 };
 
 KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) :


@@ -70,8 +66,8 @@ void KItemListContainerViewport::wheelEvent(QWheelEvent* event)
 KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* parent) :
     QAbstractScrollArea(parent),
     m_controller(controller),
 KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* parent) :
     QAbstractScrollArea(parent),
     m_controller(controller),

-    m_horizontalSmoothScroller(0),
-    m_verticalSmoothScroller(0)
+    m_horizontalSmoothScroller(nullptr),
+    m_verticalSmoothScroller(nullptr)

 {
     Q_ASSERT(controller);
     controller->setParent(this);
 {
     Q_ASSERT(controller);
     controller->setParent(this);


@@ -83,10 +79,10 @@ KItemListContainer::KItemListContainer(KItemListController* controller, QWidget*
     m_verticalSmoothScroller = new KItemListSmoothScroller(verticalScrollBar(), this);
 
     if (controller->model()) {
     m_verticalSmoothScroller = new KItemListSmoothScroller(verticalScrollBar(), this);
 
     if (controller->model()) {

-        slotModelChanged(controller->model(), 0);
+        slotModelChanged(controller->model(), nullptr);

     }
     if (controller->view()) {
     }
     if (controller->view()) {

-        slotViewChanged(controller->view(), 0);
+        slotViewChanged(controller->view(), nullptr);

     }
 
     connect(controller, &KItemListController::modelChanged,
     }
 
     connect(controller, &KItemListController::modelChanged,


@@ -100,7 +96,7 @@ KItemListContainer::~KItemListContainer()
     // Don't rely on the QObject-order to delete the controller, otherwise
     // the QGraphicsScene might get deleted before the view.
     delete m_controller;
     // Don't rely on the QObject-order to delete the controller, otherwise
     // the QGraphicsScene might get deleted before the view.
     delete m_controller;

-    m_controller = 0;
+    m_controller = nullptr;

 }
 
 KItemListController* KItemListContainer::controller() const
 }
 
 KItemListController* KItemListContainer::controller() const


@@ -185,29 +181,19 @@ void KItemListContainer::wheelEvent(QWheelEvent* event)
     KItemListSmoothScroller* smoothScroller = scrollHorizontally ?
                                               m_horizontalSmoothScroller : m_verticalSmoothScroller;
 
     KItemListSmoothScroller* smoothScroller = scrollHorizontally ?
                                               m_horizontalSmoothScroller : m_verticalSmoothScroller;
 

-    const QScrollBar* scrollBar = smoothScroller->scrollBar();
-    if (!event->pixelDelta().isNull()) {
-        const int numPixels =  event->pixelDelta().y();
-        smoothScroller->scrollTo(scrollBar->value() - numPixels);
-    } else {
-        const int numDegrees = event->angleDelta().y() / 8;
-        const int numSteps = numDegrees / 15;
-        smoothScroller->scrollTo(scrollBar->value() - numSteps * scrollBar->pageStep() / 4);
-    }
-
-    event->accept();
+    smoothScroller->handleWheelEvent(event);

 }
 
 void KItemListContainer::slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {
 }
 
 void KItemListContainer::slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {

-    Q_UNUSED(previous);
+    Q_UNUSED(previous)

     updateSmoothScrollers(current);
 }
 
 void KItemListContainer::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
 {
     updateSmoothScrollers(current);
 }
 
 void KItemListContainer::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

 }
 
 void KItemListContainer::slotViewChanged(KItemListView* current, KItemListView* previous)
 }
 
 void KItemListContainer::slotViewChanged(KItemListView* current, KItemListView* previous)


@@ -226,8 +212,8 @@ void KItemListContainer::slotViewChanged(KItemListView* current, KItemListView*
         disconnect(previous, &KItemListView::maximumItemOffsetChanged,
                    this, &KItemListContainer::updateItemOffsetScrollBar);
         disconnect(previous, &KItemListView::scrollTo, this, &KItemListContainer::scrollTo);
         disconnect(previous, &KItemListView::maximumItemOffsetChanged,
                    this, &KItemListContainer::updateItemOffsetScrollBar);
         disconnect(previous, &KItemListView::scrollTo, this, &KItemListContainer::scrollTo);

-        m_horizontalSmoothScroller->setTargetObject(0);
-        m_verticalSmoothScroller->setTargetObject(0);
+        m_horizontalSmoothScroller->setTargetObject(nullptr);
+        m_verticalSmoothScroller->setTargetObject(nullptr);

     }
     if (current) {
         scene->addItem(current);
     }
     if (current) {
         scene->addItem(current);


@@ -267,15 +253,22 @@ void KItemListContainer::updateScrollOffsetScrollBar()
         return;
     }
 
         return;
     }
 

-    KItemListSmoothScroller* smoothScroller = 0;
-    QScrollBar* scrollOffsetScrollBar = 0;
+    KItemListSmoothScroller* smoothScroller = nullptr;
+    QScrollBar* scrollOffsetScrollBar = nullptr;

     int singleStep = 0;
     int pageStep = 0;
     int maximum = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
         smoothScroller = m_verticalSmoothScroller;
         scrollOffsetScrollBar = verticalScrollBar();
     int singleStep = 0;
     int pageStep = 0;
     int maximum = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
         smoothScroller = m_verticalSmoothScroller;
         scrollOffsetScrollBar = verticalScrollBar();

-        singleStep = view->itemSize().height();
+
+        // Don't scroll super fast when using a wheel mouse:
+        // We want to consider one "line" to be the text label which has a
+        // roughly fixed height rather than using the height of the icon which
+        // may be very tall
+        const QFontMetrics metrics(font());
+        singleStep = metrics.height() * QApplication::wheelScrollLines();
+

         // We cannot use view->size().height() because this height might
         // include the header widget, which is not part of the scrolled area.
         pageStep = view->verticalPageStep();
         // We cannot use view->size().height() because this height might
         // include the header widget, which is not part of the scrolled area.
         pageStep = view->verticalPageStep();


@@ -318,8 +311,8 @@ void KItemListContainer::updateItemOffsetScrollBar()
         return;
     }
 
         return;
     }
 

-    KItemListSmoothScroller* smoothScroller = 0;
-    QScrollBar* itemOffsetScrollBar = 0;
+    KItemListSmoothScroller* smoothScroller = nullptr;
+    QScrollBar* itemOffsetScrollBar = nullptr;

     int singleStep = 0;
     int pageStep = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
     int singleStep = 0;
     int pageStep = 0;
     if (view->scrollOrientation() == Qt::Vertical) {


@@ -417,3 +410,4 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
     }
 }
 
     }
 }
 

+#include "kitemlistcontainer.moc"