From b8257393fd281209a13e126a368e1faad62c5d34 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Thu, 20 Dec 2012 08:19:10 +0100
Subject: [PATCH] * PlayableCover now uses round images as default.

---
 src/libtomahawk/widgets/PlayableCover.cpp | 64 +++++++++++++----------
 src/libtomahawk/widgets/PlayableCover.h   |  4 ++
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/libtomahawk/widgets/PlayableCover.cpp b/src/libtomahawk/widgets/PlayableCover.cpp
index ddb293c3a..74eca96f3 100644
--- a/src/libtomahawk/widgets/PlayableCover.cpp
+++ b/src/libtomahawk/widgets/PlayableCover.cpp
@@ -77,19 +77,28 @@ PlayableCover::resizeEvent( QResizeEvent* event )
 }
 
 
+void
+PlayableCover::setPixmap( const QPixmap& pixmap )
+{
+    m_pixmap = TomahawkUtils::createRoundedImage( pixmap, size() );
+}
+
+
 void
 PlayableCover::paintEvent( QPaintEvent* event )
 {
-    QLabel::paintEvent( event );
+    QPainter painter( this );
+    painter.setRenderHint( QPainter::Antialiasing );
+    painter.drawPixmap( 0, 0, pixmap() );
+
     if ( !m_showText )
         return;
 
     QRect r = contentsRect().adjusted( margin(), margin(), -margin(), -margin() );
     QPixmap buffer( r.size() );
     buffer.fill( Qt::transparent );
-
-    QPainter painter( &buffer );
-
+    QPainter bufpainter( &buffer );
+    
     QTextOption to;
     to.setWrapMode( QTextOption::NoWrap );
     
@@ -134,63 +143,60 @@ PlayableCover::paintEvent( QPaintEvent* event )
     gradient.setColorAt( 0.6, c2 );
     gradient.setColorAt( 1.0, c2 );
     
-    painter.save();
-    painter.setPen( Qt::transparent );
-    painter.setBrush( gradient );
-    painter.drawRect( gradientRect );
-    painter.restore();
+    bufpainter.save();
+    bufpainter.setPen( Qt::transparent );
+    bufpainter.setBrush( gradient );
+    bufpainter.drawRect( gradientRect );
+    bufpainter.restore();
     
-    painter.setPen( Qt::white );
+    bufpainter.setPen( Qt::white );
     
     QRect textRect = r.adjusted( 8, r.height() - frameHeight - 16, -8, -16 );
     bool oneLiner = false;
     if ( bottom.isEmpty() )
         oneLiner = true;
     
-    painter.setFont( boldFont );
+    bufpainter.setFont( boldFont );
     if ( oneLiner )
     {
-        painter.save();
-        QFont f = painter.font();
+        bufpainter.save();
+        QFont f = bufpainter.font();
 
-        while ( f.pointSizeF() > 9 && painter.fontMetrics().width( top ) > textRect.width() )
+        while ( f.pointSizeF() > 9 && bufpainter.fontMetrics().width( top ) > textRect.width() )
         {
             f.setPointSizeF( f.pointSizeF() - 0.2 );
-            painter.setFont( f );
+            bufpainter.setFont( f );
         }
             
         to.setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
-        text = painter.fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - 3 );
-        painter.drawText( textRect, text, to );
+        text = bufpainter.fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - 3 );
+        bufpainter.drawText( textRect, text, to );
 
-        painter.restore();
+        bufpainter.restore();
     }
     else
     {
         to.setAlignment( Qt::AlignHCenter | Qt::AlignTop );
-        text = painter.fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - 3 );
-        painter.drawText( textRect, text, to );
+        text = bufpainter.fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - 3 );
+        bufpainter.drawText( textRect, text, to );
         
-        painter.setFont( font );
+        bufpainter.setFont( font );
         // If the user is hovering over an artist rect, draw a background so she knows it's clickable
         QRect r = textRect;
-        r.setTop( r.bottom() - painter.fontMetrics().height() );
+        r.setTop( r.bottom() - bufpainter.fontMetrics().height() );
         r.adjust( 4, 0, -4, -1 );
 /*        if ( m_hoveringOver == index )
         {
-            TomahawkUtils::drawQueryBackground( painter, opt.palette, r, 1.1 );
-            painter.setPen( opt.palette.color( QPalette::HighlightedText ) );
+            TomahawkUtils::drawQueryBackground( bufpainter, opt.palette, r, 1.1 );
+            bufpainter.setPen( opt.palette.color( QPalette::HighlightedText ) );
         }*/
         
         to.setAlignment( Qt::AlignHCenter | Qt::AlignBottom );
-        text = painter.fontMetrics().elidedText( bottom, Qt::ElideRight, textRect.width() - 16 );
-        painter.drawText( textRect.adjusted( 5, -1, -5, -1 ), text, to );
+        text = bufpainter.fontMetrics().elidedText( bottom, Qt::ElideRight, textRect.width() - 16 );
+        bufpainter.drawText( textRect.adjusted( 5, -1, -5, -1 ), text, to );
     }
 
     {
-        QPainter painter( this );
-        painter.setRenderHint( QPainter::Antialiasing );
-
         QBrush brush( buffer );
         QPen pen;
         pen.setColor( Qt::transparent );
diff --git a/src/libtomahawk/widgets/PlayableCover.h b/src/libtomahawk/widgets/PlayableCover.h
index 24914d326..9179a0f0e 100644
--- a/src/libtomahawk/widgets/PlayableCover.h
+++ b/src/libtomahawk/widgets/PlayableCover.h
@@ -43,11 +43,15 @@ public:
     bool showText() const { return m_showText; }
     void setShowText( bool b ) { m_showText = b; }
 
+    QPixmap pixmap() const { return m_pixmap; }
+
 public slots:
     virtual void setArtist( const Tomahawk::artist_ptr& artist );
     virtual void setAlbum( const Tomahawk::album_ptr& album );
     virtual void setQuery( const Tomahawk::query_ptr& query );
 
+    void setPixmap( const QPixmap& pixmap );
+
 protected:
     virtual void resizeEvent( QResizeEvent* event );
     virtual void paintEvent( QPaintEvent* event );