From 82efe3bf49396fcbe360622177c0b3275f8089cb Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Fri, 7 Dec 2012 05:53:43 +0100
Subject: [PATCH] * Fixed now playing indicator painting in delegates.

---
 .../playlist/PlaylistItemDelegate.cpp          | 18 ++++++++++--------
 .../playlist/PlaylistLargeItemDelegate.cpp     | 12 ++++++------
 src/libtomahawk/playlist/TreeItemDelegate.cpp  |  7 ++++---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/libtomahawk/playlist/PlaylistItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp
index a8ec08575..84a5bbccf 100644
--- a/src/libtomahawk/playlist/PlaylistItemDelegate.cpp
+++ b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp
@@ -168,11 +168,11 @@ PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem&
         // Paint Now Playing Speaker Icon
         if ( item->isPlaying() )
         {
-            QPixmap nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker );
-            QRect npr = r.adjusted( 3, r.height() / 2 - nowPlayingIcon.height() / 2, 18 - r.width(), -r.height() / 2 + nowPlayingIcon.height() / 2  );
-            nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() );
-            painter->drawPixmap( npr, nowPlayingIcon );
-            r.adjust( 22, 0, 0, 0 );
+            const int pixMargin = 2;
+            const int pixHeight = r.height() - pixMargin * 2;
+            QRect npr = r.adjusted( pixMargin, pixMargin + 1, pixHeight - r.width() + pixMargin, -pixMargin + 1 );
+            painter->drawPixmap( npr, TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() ) );
+            r.adjust( pixHeight + 8, 0, 0, 0 );
         }
 
         painter->setPen( opt.palette.text().color() );
@@ -273,9 +273,11 @@ PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewIt
         // Paint Now Playing Speaker Icon
         if ( m_view->header()->visualIndex( index.column() ) == 0 )
         {
-            r.adjust( 0, 0, 0, -3 );
-            painter->drawPixmap( r.adjusted( 3, 1, 18 - r.width(), 1 ), TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker ) );
-            r.adjust( 25, 0, 0, 3 );
+            const int pixMargin = 1;
+            const int pixHeight = r.height() - pixMargin * 2;
+            QRect npr = r.adjusted( pixMargin, pixMargin, pixHeight - r.width() + pixMargin, -pixMargin );
+            painter->drawPixmap( npr, TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() ) );
+            r.adjust( pixHeight + 6, 0, 0, 0 );
         }
 
         painter->setPen( opt.palette.text().color() );
diff --git a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
index 03a135eaa..cae2f5ea7 100644
--- a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
+++ b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
@@ -170,16 +170,16 @@ PlaylistLargeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem&
 
     painter->save();
     {
-        QRect r = opt.rect.adjusted( 3, 6, 0, -6 );
+        QRect r = opt.rect.adjusted( 4, 6, 0, -6 );
 
         // Paint Now Playing Speaker Icon
         if ( item->isPlaying() )
         {
-            QPixmap nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker );
-            QRect npr = r.adjusted( 3, r.height() / 2 - nowPlayingIcon.height() / 2, 18 - r.width(), -r.height() / 2 + nowPlayingIcon.height() / 2 );
-            nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() );
-            painter->drawPixmap( npr, nowPlayingIcon );
-            r.adjust( 22, 0, 0, 0 );
+            const int pixMargin = 4;
+            const int pixHeight = r.height() - pixMargin * 2;
+            QRect npr = r.adjusted( pixMargin, pixMargin + 1, pixHeight - r.width() + pixMargin, -pixMargin + 1 );
+            painter->drawPixmap( npr, TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() ) );
+            r.adjust( pixHeight + 8, 0, 0, 0 );
         }
 
         painter->setPen( opt.palette.text().color() );
diff --git a/src/libtomahawk/playlist/TreeItemDelegate.cpp b/src/libtomahawk/playlist/TreeItemDelegate.cpp
index 548734d04..17e9f8aa7 100644
--- a/src/libtomahawk/playlist/TreeItemDelegate.cpp
+++ b/src/libtomahawk/playlist/TreeItemDelegate.cpp
@@ -115,10 +115,11 @@ TreeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
                 // Paint Now Playing Speaker Icon
                 if ( item->isPlaying() && m_view->header()->visualIndex( index.column() ) == 0 )
                 {
-                    r.adjust( 0, 0, 0, -3 );
-                    QRect npr = r.adjusted( 3, 1, 18 - r.width(), 1 );
+                    const int pixMargin = 1;
+                    const int pixHeight = r.height() - pixMargin * 2;
+                    QRect npr = r.adjusted( pixMargin, pixMargin, pixHeight - r.width() + pixMargin, -pixMargin );
                     painter->drawPixmap( npr, TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() ) );
-                    r.adjust( 25, 0, 0, 3 );
+                    r.adjust( pixHeight + 6, 0, 0, 0 );
                 }
 
                 painter->setPen( o.palette.text().color() );