From c91c9c4804830c8928e0718f90e1b77bba0e8bce Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Mon, 20 Aug 2012 09:36:53 -0400
Subject: [PATCH] UI tweaks to slider, and get rid of pixmap

---
 data/images/sliderbutton_knob.png | Bin 3122 -> 0 bytes
 resources.qrc                     |   1 -
 src/widgets/SlideSwitchButton.cpp |  59 ++++++++++++++++++++++--------
 src/widgets/SlideSwitchButton.h   |   2 +
 4 files changed, 46 insertions(+), 16 deletions(-)
 delete mode 100644 data/images/sliderbutton_knob.png

diff --git a/data/images/sliderbutton_knob.png b/data/images/sliderbutton_knob.png
deleted file mode 100644
index 86eeead83e6e831854a8e3be19035a64c384f42d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3122
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
M07*qoM6N<$g6JOhWdHyG

diff --git a/resources.qrc b/resources.qrc
index 3aa493019..094a99153 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -153,6 +153,5 @@
         <file>data/images/add-contact.png</file>
         <file>data/images/account-none.png</file>
         <file>data/images/green-dot.png</file>
-	<file>data/images/sliderbutton_knob.png</file>
     </qresource>
 </RCC>
diff --git a/src/widgets/SlideSwitchButton.cpp b/src/widgets/SlideSwitchButton.cpp
index 959e875ff..a9b380c2b 100644
--- a/src/widgets/SlideSwitchButton.cpp
+++ b/src/widgets/SlideSwitchButton.cpp
@@ -26,6 +26,13 @@
 #include <QStyleOptionButton>
 #include <QPixmap>
 
+namespace {
+    // Width to height ratio (70x20)
+    const qreal ASPECT_RATIO = 3.5;
+    // Knob is originally 32x20
+    const qreal KNOB_ASPECT_RATIO = 1.6;
+}
+
 SlideSwitchButton::SlideSwitchButton( QWidget* parent )
     : QPushButton( parent )
     , m_checkedText( tr( "On" ) )
@@ -52,8 +59,6 @@ SlideSwitchButton::init()
     setMouseTracking( true );
 #endif
 
-    m_knob.load( RESPATH "images/sliderbutton_knob.png" );
-
     m_backCheckedColorTop = QColor( 8, 54, 134 );
     m_backCheckedColorBottom = QColor( 118, 172, 240 );
     m_backUncheckedColorTop = QColor( 128, 128, 128 );
@@ -74,6 +79,8 @@ SlideSwitchButton::init()
 
     connect( this, SIGNAL( toggled( bool ) ),
              this, SLOT( onCheckedStateChanged() ) );
+
+    createKnob();
 }
 
 QSize
@@ -101,28 +108,28 @@ SlideSwitchButton::paintEvent( QPaintEvent* event )
     QStyleOptionButton option;
     initStyleOption( &option );
 
-    QPen border;
-    border.setWidth( 1 );
-#ifndef Q_OS_MAC
-    if ( option.state &  QStyle::State_MouseOver )
-       border.setColor( palette.color( QPalette::Highlight ) );
-    else
-#endif
-       border.setColor( QColor( "#606060" ) );
-    painter.setPen( border );
-    //TODO: should the whole thing be highlighted or just the knob?
-
     QLinearGradient gradient( 0, 0, 0, 1 );
     gradient.setCoordinateMode( QGradient::ObjectBoundingMode );
     gradient.setColorAt( 0, m_baseColorTop );
     gradient.setColorAt( 1, m_baseColorBottom );
     painter.setBrush( gradient );
 
-    painter.drawRoundedRect( QRect( 0, 0, width() - 0, height() - 0 ).adjusted( 3, 0, -3, 0 ), 2, 2 );
+    QPainterPath borderPath;
+    const QRect borderRect = QRect( 0, 0, width(), height() );
+    borderPath.addRoundedRect( borderRect, 3, 3 );
+    painter.fillPath( borderPath, gradient );
 
     painter.drawPixmap( m_knobX * ( width() - m_knob.width() ), 0, m_knob );
 
-    qDebug() << "Drawn with knob at:" << m_knobX;
+#ifndef Q_OS_MAC
+    if ( option.state &  QStyle::State_MouseOver )
+    {
+        painter.setBrush( QBrush() );
+        painter.setPen( palette.color( QPalette::Highlight ) );
+        //TODO: should the whole thing be highlighted or just the knob?
+        painter.drawRoundedRect( borderRect, 3, 3 );
+    }
+#endif
 
     if ( m_knobX != 1.0 && m_knobX != 0.0 )
         return;
@@ -185,3 +192,25 @@ SlideSwitchButton::backChecked() const
 {
     return m_backChecked;
 }
+
+
+void
+SlideSwitchButton::createKnob()
+{
+    const qreal knobWidth = sizeHint().height() * KNOB_ASPECT_RATIO;
+    m_knob = QPixmap( QSize( knobWidth, sizeHint().height() ) );
+    m_knob.fill( Qt::transparent );
+
+    QPainter p( &m_knob );
+    p.setRenderHint( QPainter::Antialiasing );
+
+    QLinearGradient gradient( 0, 0, 0, 1 );
+    gradient.setCoordinateMode( QGradient::ObjectBoundingMode );
+    gradient.setColorAt( 0, Qt::white );
+    gradient.setColorAt( 1, QColor( 223, 223, 223 ) );
+
+    p.setBrush( gradient );
+    p.setPen( QColor( 152, 152, 152 ) );
+
+    p.drawRoundedRect( m_knob.rect(), 3, 3 );
+}
diff --git a/src/widgets/SlideSwitchButton.h b/src/widgets/SlideSwitchButton.h
index 7c881d963..2b475736e 100644
--- a/src/widgets/SlideSwitchButton.h
+++ b/src/widgets/SlideSwitchButton.h
@@ -65,6 +65,8 @@ private slots:
     void onCheckedStateChanged();
 
 private:
+    void createKnob();
+
     QPixmap m_knob;
 
     QString m_checkedText;