From 18628defa432413ce76a183ce052e89030c69c65 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 4 Aug 2011 06:34:36 +0200 Subject: [PATCH] * Fixed info.png's size. --- src/libtomahawk/globalactionmanager.cpp | 8 +++++--- src/libtomahawk/playlist/playlistitemdelegate.cpp | 5 ++++- src/libtomahawk/playlist/playlistitemdelegate.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp index b83238c98..b99100f52 100644 --- a/src/libtomahawk/globalactionmanager.cpp +++ b/src/libtomahawk/globalactionmanager.cpp @@ -688,15 +688,17 @@ GlobalActionManager::showPlaylist() } void -GlobalActionManager::waitingForResolved( bool success ) +GlobalActionManager::waitingForResolved( bool /* success */ ) { - if( m_waitingToPlay.data() != sender() ) + if ( m_waitingToPlay.data() != sender() ) { m_waitingToPlay.clear(); return; } - if( !m_waitingToPlay.isNull() && m_waitingToPlay->playable() ) { // play it! + if ( !m_waitingToPlay.isNull() && m_waitingToPlay->playable() ) + { + // play it! // AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() ); AudioEngine::instance()->play(); diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp index 6ba559f95..fddeca85a 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp @@ -47,7 +47,7 @@ PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, TrackProxyModel* , m_model( proxy ) { m_nowPlayingIcon = QPixmap( PLAYING_ICON ); - m_arrowIcon = QPixmap( ARROW_ICON ).scaled( 14, 14, Qt::KeepAspectRatio, Qt::SmoothTransformation ); + m_arrowIcon = QPixmap( ARROW_ICON ); m_topOption = QTextOption( Qt::AlignTop ); m_topOption.setWrapMode( QTextOption::NoWrap ); @@ -251,6 +251,9 @@ PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewIt { opt.rect.setWidth( opt.rect.width() - 16 ); QRect arrowRect( opt.rect.x() + opt.rect.width(), opt.rect.y() + 1, opt.rect.height() - 2, opt.rect.height() - 2 ); + + if ( m_arrowIcon.height() != arrowRect.height() ) + m_arrowIcon = m_arrowIcon.scaled( arrowRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ); painter->drawPixmap( arrowRect, m_arrowIcon ); } diff --git a/src/libtomahawk/playlist/playlistitemdelegate.h b/src/libtomahawk/playlist/playlistitemdelegate.h index 4d1cd1f27..6d9bcae7c 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.h +++ b/src/libtomahawk/playlist/playlistitemdelegate.h @@ -56,7 +56,7 @@ private: mutable QHash< qint64, QPixmap > m_cache; QPixmap m_nowPlayingIcon; - QPixmap m_arrowIcon; + mutable QPixmap m_arrowIcon; QTextOption m_topOption; QTextOption m_centerOption;