X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5360bc3ab328c8b1161b0c5df9c5785829a3e880..38c34eeca315c7be58e65d4d3fb72aaf7b866719:/src/kitemviews/private/kitemlistsmoothscroller.cpp

diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index 6b475b5f0..19d47aac8 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -12,25 +12,18 @@
 #include <QStyle>
 #include <QWheelEvent>
 
-KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
-                                                 QObject* parent) :
-    QObject(parent),
-    m_scrollBarPressed(false),
-    m_smoothScrolling(true),
-    m_scrollBar(scrollBar),
-    m_animation(nullptr)
+KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar *scrollBar, QObject *parent)
+    : QObject(parent)
+    , m_scrollBarPressed(false)
+    , m_smoothScrolling(true)
+    , m_scrollBar(scrollBar)
+    , m_animation(nullptr)
 {
     m_animation = new QPropertyAnimation(this);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     const int animationDuration = m_scrollBar->style()->styleHint(QStyle::SH_Widget_Animation_Duration, nullptr, m_scrollBar);
     const bool animationEnabled = (animationDuration > 0);
- #else
-    const int animationDuration = 100;
-    const bool animationEnabled = m_scrollBar->style()->styleHint(QStyle::SH_Widget_Animate, nullptr, m_scrollBar);
-#endif
     m_animation->setDuration(animationEnabled ? animationDuration : 1);
-    connect(m_animation, &QPropertyAnimation::stateChanged,
-            this, &KItemListSmoothScroller::slotAnimationStateChanged);
+    connect(m_animation, &QPropertyAnimation::stateChanged, this, &KItemListSmoothScroller::slotAnimationStateChanged);
 
     m_scrollBar->installEventFilter(this);
 }
@@ -44,22 +37,22 @@ void KItemListSmoothScroller::setScrollBar(QScrollBar *scrollBar)
     m_scrollBar = scrollBar;
 }
 
-QScrollBar* KItemListSmoothScroller::scrollBar() const
+QScrollBar *KItemListSmoothScroller::scrollBar() const
 {
     return m_scrollBar;
 }
 
-void KItemListSmoothScroller::setTargetObject(QObject* target)
+void KItemListSmoothScroller::setTargetObject(QObject *target)
 {
     m_animation->setTargetObject(target);
 }
 
-QObject* KItemListSmoothScroller::targetObject() const
+QObject *KItemListSmoothScroller::targetObject() const
 {
     return m_animation->targetObject();
 }
 
-void KItemListSmoothScroller::setPropertyName(const QByteArray& propertyName)
+void KItemListSmoothScroller::setPropertyName(const QByteArray &propertyName)
 {
     m_animation->setPropertyName(propertyName);
 }
@@ -71,7 +64,7 @@ QByteArray KItemListSmoothScroller::propertyName() const
 
 void KItemListSmoothScroller::scrollContentsBy(qreal distance)
 {
-    QObject* target = targetObject();
+    QObject *target = targetObject();
     if (!target) {
         return;
     }
@@ -148,7 +141,7 @@ bool KItemListSmoothScroller::requestScrollBarUpdate(int newMaximum)
     return true;
 }
 
-bool KItemListSmoothScroller::eventFilter(QObject* obj, QEvent* event)
+bool KItemListSmoothScroller::eventFilter(QObject *obj, QEvent *event)
 {
     Q_ASSERT(obj == m_scrollBar);
 
@@ -173,25 +166,32 @@ bool KItemListSmoothScroller::eventFilter(QObject* obj, QEvent* event)
     return QObject::eventFilter(obj, event);
 }
 
-void KItemListSmoothScroller::slotAnimationStateChanged(QAbstractAnimation::State newState,
-                                                        QAbstractAnimation::State oldState)
+void KItemListSmoothScroller::slotAnimationStateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
 {
     Q_UNUSED(oldState)
     if (newState == QAbstractAnimation::Stopped && m_smoothScrolling && !m_scrollBarPressed) {
         m_smoothScrolling = false;
     }
+    if (newState == QAbstractAnimation::Stopped) {
+        Q_EMIT scrollingStopped();
+    }
 }
 
-void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event)
+void KItemListSmoothScroller::handleWheelEvent(QWheelEvent *event)
 {
     const bool previous = m_smoothScrolling;
 
     m_smoothScrolling = true;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QWheelEvent *copy = event->clone();
+    QApplication::sendEvent(m_scrollBar, copy);
+    event->setAccepted(copy->isAccepted());
+#else
     QWheelEvent copy = *event;
     QApplication::sendEvent(m_scrollBar, &copy);
     event->setAccepted(copy.isAccepted());
+#endif
 
     m_smoothScrolling = previous;
 }
-