┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews/private
diff options
context:
space:
mode:
Diffstat (limited to 'src/kitemviews/private')
-rw-r--r--src/kitemviews/private/kitemlistsmoothscroller.cpp26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index 915b6b3d5..7cedf9d94 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -209,6 +209,32 @@ void KItemListSmoothScroller::handleWheelEvent(QWheelEvent *event)
{
const bool previous = m_smoothScrolling;
+#ifdef Q_OS_MACOS
+ if (event->hasPixelDelta()) {
+ const QPoint pixelDelta = event->pixelDelta();
+ const int scrollDelta = qAbs(pixelDelta.x()) > qAbs(pixelDelta.y()) ? pixelDelta.x() : pixelDelta.y();
+ const int oldValue = m_scrollBar->value();
+ const int newValue = qBound(m_scrollBar->minimum(), oldValue - scrollDelta, m_scrollBar->maximum());
+ if (newValue == oldValue) {
+ event->ignore();
+ return;
+ }
+
+ m_smoothScrolling = false;
+ if (m_animation->state() == QAbstractAnimation::Running) {
+ m_animation->stop();
+ }
+ if (QObject *target = targetObject()) {
+ target->setProperty(propertyName(), newValue);
+ }
+ m_scrollBar->setValue(newValue);
+ event->accept();
+
+ m_smoothScrolling = previous;
+ return;
+ }
+#endif
+
m_smoothScrolling = true;
QWheelEvent *copy = event->clone();