From 3aac164f1e66e978d2b4ad4ffa2081d818fa2738 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 8 Oct 2015 13:31:29 +0100 Subject: [PATCH] Reverse volume slider direction with horizontal scroll. Fixes #5064 --- src/widgets/sliderwidget.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp index 9e45647fc..a36ec22ee 100644 --- a/src/widgets/sliderwidget.cpp +++ b/src/widgets/sliderwidget.cpp @@ -49,9 +49,7 @@ void Amarok::Slider::wheelEvent(QWheelEvent* e) { // Position Slider (horizontal) int step = e->delta() * 1500 / 18; - int nval = QSlider::value() + step; - nval = qMax(nval, minimum()); - nval = qMin(nval, maximum()); + int nval = qBound(minimum(), QSlider::value() + step, maximum()); QSlider::setValue(nval); @@ -274,9 +272,8 @@ void Amarok::VolumeSlider::slideEvent(QMouseEvent* e) { } void Amarok::VolumeSlider::wheelEvent(QWheelEvent* e) { - const uint step = e->delta() / 30; + const uint step = e->delta() / (e->orientation() == Qt::Vertical ? 30 : -30); QSlider::setValue(QSlider::value() + step); - emit sliderReleased(value()); }