From f39ab69a415eb8817f8a68c30cd8e0a746511372 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 9 Apr 2016 16:54:54 +0000
Subject: qsui: fixed volume slider

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6236 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/qsui/mainwindow.cpp   | 2 +-
 src/plugins/Ui/qsui/volumeslider.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 88ee306cd..5f78d93a5 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -137,7 +137,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     m_volumeSlider->setFixedWidth(100);
     m_volumeSlider->setRange(0,100);
     SET_ACTION(ActionManager::VOL_MUTE, m_core, SLOT(setMuted(bool)));
-    connect(m_volumeSlider, SIGNAL(valueChanged(int)), m_core, SLOT(setVolume(int)));
+    connect(m_volumeSlider, SIGNAL(sliderMoved(int)), m_core, SLOT(setVolume(int)));
     connect(m_core, SIGNAL(volumeChanged(int)), m_volumeSlider, SLOT(setValue(int)));
     connect(m_core, SIGNAL(volumeChanged(int)), SLOT(updateVolumeIcon()));
     connect(m_core, SIGNAL(mutedChanged(bool)), SLOT(updateVolumeIcon()));
diff --git a/src/plugins/Ui/qsui/volumeslider.cpp b/src/plugins/Ui/qsui/volumeslider.cpp
index 1d5af625e..294003c40 100644
--- a/src/plugins/Ui/qsui/volumeslider.cpp
+++ b/src/plugins/Ui/qsui/volumeslider.cpp
@@ -48,6 +48,8 @@ void VolumeSlider::mousePressEvent (QMouseEvent *event)
         else
             val = minimum() + ((maximum() - minimum()) * event->x()) / width();
 
+        setSliderDown (true);
+
         if (invertedAppearance() == true)
         {
             setValue(maximum() - val);
@@ -58,8 +60,6 @@ void VolumeSlider::mousePressEvent (QMouseEvent *event)
             setValue(val);
             onSliderMoved(val);
         }
-
-        setSliderDown (true);
         event->accept();
     }
     QSlider::mousePressEvent(event);
@@ -73,8 +73,9 @@ void VolumeSlider::mouseReleaseEvent (QMouseEvent *event)
 
 void VolumeSlider::wheelEvent(QWheelEvent *event)
 {
+    setSliderDown(true);
     setValue(value() + event->delta() / 20);
-    sliderReleased();
+    setSliderDown(false);
 }
 
 void VolumeSlider::onSliderMoved(int pos)
-- 
cgit v1.2.3-13-gbd6f