* Cleaned up StyleHelper and use it in ContextWidget.

src/libtomahawk/CMakeLists.txt

@@ -377,7 +377,6 @@ set( libHeaders
     utils/spotifyparser.h
     utils/rdioparser.h
     utils/shortenedlinkparser.h
-    utils/stylehelper.h
 
     widgets/querylabel.h
     widgets/animatedcounterlabel.h

src/libtomahawk/context/ContextWidget.cpp

@@ -92,7 +92,7 @@ ContextWidget::ContextWidget( QWidget* parent )
     setFixedHeight( m_minHeight );
 
     QPalette pal = palette();
-    pal.setBrush( QPalette::Window, QColor( 0x70, 0x70, 0x70 ) );
+    pal.setBrush( QPalette::Window, StyleHelper::headerLowerColor() );
     setPalette( pal );
 
     connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( toggleSize() ) );

src/libtomahawk/utils/stylehelper.cpp

@@ -22,22 +22,30 @@
 #include <QPixmapCache>
 #include <QApplication>
 
-QColor StyleHelper::headerUpperColor()
+
+QColor
+StyleHelper::headerUpperColor()
 {
     return QColor( 80, 80, 80 );
 }
 
-QColor StyleHelper::headerLowerColor()
+
+QColor
+StyleHelper::headerLowerColor()
 {
     return QColor( 72, 72, 72 );
 }
 
-QColor StyleHelper::headerHighlightColor()
+
+QColor
+StyleHelper::headerHighlightColor()
 {
     return QColor( "#333" );
 }
 
-void StyleHelper::horizontalHeader(QPainter *painter, const QRect &r)
+
+void
+StyleHelper::horizontalHeader( QPainter* painter, const QRect& r )
 {
     QRect upperHalf( 0, 0, r.width(), r.height() / 2 );
     QRect lowerHalf( 0, upperHalf.height(), r.width(), r.height() );
@@ -58,7 +66,9 @@ void StyleHelper::horizontalHeader(QPainter *painter, const QRect &r)
     }
 }
 
-QColor StyleHelper::headerTextColor()
+
+QColor
+StyleHelper::headerTextColor()
 {
     return Qt::white;
 }
@@ -73,38 +83,44 @@ QColor StyleHelper::headerTextColor()
  */
 void StyleHelper::drawArrow( QStyle::PrimitiveElement element, QPainter* p, const QStyleOption* opt )
 {
-
     if ( opt->rect.width() <= 1 || opt->rect.height() <= 1 )
         return;
+
     QRect r = opt->rect;
     int size = qMin( r.height(), r.width() );
     QPixmap pixmap;
     QString pixmapName;
-    pixmapName.sprintf("arrow-%s-%d-%d-%d-%lld",
+
-                       "$qt_ia",
+    pixmapName.sprintf( "arrow-%s-%d-%d-%d-%lld", "$qt_ia", uint(opt->state), element, size, opt->palette.cacheKey() );
-                       uint(opt->state), element,
+    if ( !QPixmapCache::find( pixmapName, pixmap) )
-                       size, opt->palette.cacheKey());
+    {
-    if (!QPixmapCache::find(pixmapName, pixmap)) {
         int border = size / 5;
         int sqsize = 2 * ( size / 2 );
+
         QImage image( sqsize, sqsize, QImage::Format_ARGB32 );
         image.fill( 0 );
         QPainter imagePainter( &image );
         imagePainter.setRenderHint( QPainter::Antialiasing, true );
         QPolygon a;
-        switch (element) {
+
+        switch ( element )
+        {
             case QStyle::PE_IndicatorArrowUp:
                 a.setPoints( 3, border, sqsize / 2, sqsize / 2, border, sqsize - border, sqsize / 2 );
                 break;
+
             case QStyle::PE_IndicatorArrowDown:
                 a.setPoints( 3, border, sqsize / 2, sqsize / 2, sqsize - border,  sqsize - border, sqsize / 2 );
                 break;
+
             case QStyle::PE_IndicatorArrowRight:
                 a.setPoints( 3, sqsize - border, sqsize / 2, sqsize / 2, border, sqsize / 2, sqsize - border );
                 break;
+
             case QStyle::PE_IndicatorArrowLeft:
                 a.setPoints( 3, border, sqsize / 2, sqsize / 2, border, sqsize / 2, sqsize - border );
                 break;
+
             default:
                 break;
         }
@@ -112,7 +128,8 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *p, const
         int bsx = 0;
         int bsy = 0;
 
-        if (opt->state & QStyle::State_Sunken) {
+        if ( opt->state & QStyle::State_Sunken )
+        {
             bsx = qApp->style()->pixelMetric( QStyle::PM_ButtonShiftHorizontal );
             bsy = qApp->style()->pixelMetric( QStyle::PM_ButtonShiftVertical );
         }
@@ -124,11 +141,14 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *p, const
         imagePainter.setPen( opt->palette.buttonText().color() );
         imagePainter.setBrush( opt->palette.buttonText() );
 
-        if (!(opt->state & QStyle::State_Enabled)) {
+        if ( !( opt->state & QStyle::State_Enabled ) )
+        {
             QColor foreGround( 150, 150, 150, 150 );
             imagePainter.setBrush( opt->palette.mid().color() );
             imagePainter.setPen( opt->palette.mid().color() );
-        } else {
+        }
+        else
+        {
             QColor shadow( 0, 0, 0, 100 );
             imagePainter.translate( 0, 1 );
             imagePainter.setPen( shadow );
@@ -142,9 +162,11 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *p, const
 
         imagePainter.drawPolygon( a );
         imagePainter.end();
+
         pixmap = QPixmap::fromImage( image );
         QPixmapCache::insert( pixmapName, pixmap );
     }
+
     int xOffset = r.x() + ( r.width() - size ) / 2;
     int yOffset = r.y() + ( r.height() - size ) / 2;
     p->drawPixmap( xOffset, yOffset, pixmap );

src/libtomahawk/utils/stylehelper.h

@@ -19,7 +19,6 @@
 #ifndef STYLEHELPER_H
 #define STYLEHELPER_H
 
-
 #include <QColor>
 #include <QStyle>
 #include <QStyleOption>
@@ -56,6 +55,7 @@ public:
      * Draws a header background on a painter with the specified rectangle
      */
     static void horizontalHeader( QPainter* painter, const QRect& rect );
+
     /**
      * Draws a styled arrow that looks good on a Header (from qwindowstyle.cpp)
      * \copyright {  Licensed under the GPL v3+