Merge branch 'release/20.12'

This commit is contained in:
Nate Graham 2020-12-23 11:40:09 -07:00
commit 9abe299c77

View file

@ -172,8 +172,8 @@ void KItemListContainer::wheelEvent(QWheelEvent* event)
return;
}
const bool scrollHorizontally = (event->angleDelta().x() != 0) ||
(event->angleDelta().y() != 0 && !verticalScrollBar()->isVisible());
const bool scrollHorizontally = (qAbs(event->angleDelta().y()) < qAbs(event->angleDelta().x())) ||
(!verticalScrollBar()->isVisible());
KItemListSmoothScroller* smoothScroller = scrollHorizontally ?
m_horizontalSmoothScroller : m_verticalSmoothScroller;