don't poll volume-change, change volumecontrol to use signal from

[vlc] / modules / gui / qt4 / util / input_slider.cpp

diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index 73240774d7ef23d7da2da4deaba5c72065960ae4..25fc6e45c75a62c036bfd7743320e50fcc5f9109 100644 (file)
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -75,15 +75,20 @@ void InputSlider::mouseMoveEvent(QMouseEvent *event)
     setToolTip( psz_length );
 }
 
-#define WLENGTH   100 // px
-#define WHEIGHT   28  // px
+/* This work is derived from Amarok's work under GPLv2+
+    - Mark Kretschmann
+    - Gábor Lehel
+   */
+#define WLENGTH   90 // px
+#define WHEIGHT   25  // px
 #define SOUNDMIN  0   // %
 #define SOUNDMAX  200 // % OR 400 ?
 
 SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
                         : QAbstractSlider( _parent )
 {
-    padding = 3;
+    paddingL = 5;
+    paddingR = 3;
 
     f_step = ( _i_step * 100 ) / AOUT_VOLUME_MAX ;
     setRange( SOUNDMIN, b_hard ? (2 * SOUNDMAX) : SOUNDMAX  );
@@ -97,19 +102,19 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
 
     pixGradient = QPixmap( mask.size() );
 
-    QPainter p( &pixGradient );
-    QLinearGradient gradient( padding, 2, WLENGTH , 2 );
+    QLinearGradient gradient( paddingL, 4, WLENGTH + paddingL , 4 );
     gradient.setColorAt( 0.0, Qt::white );
     gradient.setColorAt( 0.2, QColor( 20, 226, 20 ) );
     gradient.setColorAt( 0.5, QColor( 255, 176, 15 ) );
     gradient.setColorAt( 1.0, QColor( 235, 30, 20 ) );
-    p.setPen( Qt::NoPen );
-    p.setBrush( gradient );
 
-    p.drawRect( pixGradient.rect() );
-    p.end();
+    QPainter painter( &pixGradient );
+    painter.setPen( Qt::NoPen );
+    painter.setBrush( gradient );
+    painter.drawRect( pixGradient.rect() );
+    painter.end();
 
-   pixGradient.setMask( mask );
+    pixGradient.setMask( mask );
 }
 
 void SoundSlider::wheelEvent( QWheelEvent *event )
@@ -128,6 +133,7 @@ void SoundSlider::mousePressEvent( QMouseEvent *event )
         b_sliding = true;
         i_oldvalue = value();
         emit sliderPressed();
+        changeValue( event->x() - paddingL );
     }
 }
 
@@ -149,7 +155,7 @@ void SoundSlider::mouseMoveEvent( QMouseEvent *event )
 {
     if( b_sliding )
     {
-        QRect rect( padding - 15,     padding - 1,
+        QRect rect( paddingL - 15,    -1,
                     WLENGTH + 15 * 2, WHEIGHT + 4 );
         if( !rect.contains( event->pos() ) )
         { /* We are outside */
@@ -160,7 +166,7 @@ void SoundSlider::mouseMoveEvent( QMouseEvent *event )
         else
         { /* We are inside */
             b_outside = false;
-            changeValue( event->x() - padding );
+            changeValue( event->x() - paddingL );
             emit sliderMoved( value() );
         }
     }
@@ -170,14 +176,15 @@ void SoundSlider::mouseMoveEvent( QMouseEvent *event )
 
 void SoundSlider::changeValue( int x )
 {
-    setValue( QStyle::sliderValueFromPosition(
-                minimum(), maximum(), x, width() - 2 * padding ) );
+    setValue( x * maximum() / WLENGTH );
 }
 
 void SoundSlider::paintEvent(QPaintEvent *e)
 {
     QPainter painter( this );
-    const int offset = int( double( ( width() - 2 * padding ) * value() ) / maximum() );
+    const int offset = int(
+            double( WLENGTH * value() ) /
+            double( maximum() ) ) + paddingL;
 
     const QRectF boundsG( 0, 0, offset , pixGradient.height() );
     painter.drawPixmap( boundsG, pixGradient, boundsG );
@@ -185,6 +192,13 @@ void SoundSlider::paintEvent(QPaintEvent *e)
     const QRectF boundsO( 0, 0, pixOutside.width(), pixOutside.height() );
     painter.drawPixmap( boundsO, pixOutside, boundsO );
 
+    painter.setPen( palette().color( QPalette::Active, QPalette::Mid ) );
+    QFont font; font.setPixelSize( 9 );
+    painter.setFont( font );
+    const QRect rect( 0, 0, 34, 15 );
+    painter.drawText( rect, Qt::AlignRight | Qt::AlignVCenter,
+                      QString::number( value() ) + '%' );
+
     painter.end();
 }