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 24eea0cefb8bbf75527920c947fd0e218eb0a502..6bfdba4c9ae5fbd911716e96c136685e7a5ee22e 100644 (file)
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -19,13 +19,12 @@
 
 #include "kitemlistsmoothscroller.h"
 
 
 #include "kitemlistsmoothscroller.h"
 

-#include <KGlobalSettings>
+#include <QApplication>

 #include <QEvent>
 #include <QPropertyAnimation>
 #include <QScrollBar>
 #include <QWheelEvent>
 #include <QEvent>
 #include <QPropertyAnimation>
 #include <QScrollBar>
 #include <QWheelEvent>

-
-#include <KDebug>
+#include <QStyle>

 
 KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
                                                  QObject* parent) :
 
 KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
                                                  QObject* parent) :


@@ -36,7 +35,7 @@ KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
     m_animation(0)
 {
     m_animation = new QPropertyAnimation(this);
     m_animation(0)
 {
     m_animation = new QPropertyAnimation(this);

-    const int duration = (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) ? 1 : 100;
+    const int duration = m_scrollBar->style()->styleHint(QStyle::SH_Widget_Animate, nullptr, m_scrollBar) ? 100 : 1;

     m_animation->setDuration(duration);
     connect(m_animation, &QPropertyAnimation::stateChanged,
             this, &KItemListSmoothScroller::slotAnimationStateChanged);
     m_animation->setDuration(duration);
     connect(m_animation, &QPropertyAnimation::stateChanged,
             this, &KItemListSmoothScroller::slotAnimationStateChanged);


@@ -173,8 +172,7 @@ bool KItemListSmoothScroller::eventFilter(QObject* obj, QEvent* event)
         break;
 
     case QEvent::Wheel:
         break;
 
     case QEvent::Wheel:

-        handleWheelEvent(static_cast<QWheelEvent*>(event));
-        break;
+        return false; // we're the ones sending them

 
     default:
         break;
 
     default:
         break;


@@ -194,18 +192,14 @@ void KItemListSmoothScroller::slotAnimationStateChanged(QAbstractAnimation::Stat
 
 void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event)
 {
 
 void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event)
 {

-    const int numDegrees = event->delta() / 8;
-    const int numSteps = numDegrees / 15;
-

     const bool previous = m_smoothScrolling;
 
     m_smoothScrolling = true;
     const bool previous = m_smoothScrolling;
 
     m_smoothScrolling = true;

-    const int value = m_scrollBar->value();
-    const int pageStep = m_scrollBar->pageStep();
-    m_scrollBar->setValue(value - numSteps * pageStep);

 
 

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

 
 

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

 }
 
 }