mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

* Smaller close button / subscription icon in sidebar.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-21 14:07:42 +02:00
parent b722f8585d
commit 650e046587
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tomahawk/sourcetree/SourceDelegate.cpp
View File

@@ -704,14 +704,13 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
{ {
if ( opt.state & QStyle::State_MouseOver ) if ( opt.state & QStyle::State_MouseOver )
{ {
int padding = 3; m_iconHeight = ( opt.rect.height() / 2 );
m_iconHeight = ( opt.rect.height() - 2 * padding );
optIndentation.rect.adjust( 0, 0, -( padding + m_iconHeight ), 0 ); optIndentation.rect.adjust( 0, 0, -( 4 + m_iconHeight ), 0 );
paintStandardItem( painter, optIndentation, index ); paintStandardItem( painter, optIndentation, index );
// draw close icon // draw close icon
QRect r( opt.rect.right() - padding - m_iconHeight, padding + opt.rect.y(), m_iconHeight, m_iconHeight ); QRect r( opt.rect.right() - 4 - m_iconHeight, opt.rect.y() + ( opt.rect.height() - m_iconHeight ) / 2, m_iconHeight, m_iconHeight );
painter->drawPixmap( r, TomahawkUtils::defaultPixmap( TomahawkUtils::ListRemove, TomahawkUtils::Original, r.size() ) ); painter->drawPixmap( r, TomahawkUtils::defaultPixmap( TomahawkUtils::ListRemove, TomahawkUtils::Original, r.size() ) );
} }
else else
@@ -724,18 +723,15 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
PlaylistItem* plItem = qobject_cast< PlaylistItem* >( item ); PlaylistItem* plItem = qobject_cast< PlaylistItem* >( item );
if ( plItem->canSubscribe() && !plItem->subscribedIcon().isNull() ) if ( plItem->canSubscribe() && !plItem->subscribedIcon().isNull() )
{ {
const int padding = 2; const int imgWidth = optIndentation.rect.height() / 2;
const int imgWidth = optIndentation.rect.height() - 2 * padding;
const QPixmap icon = plItem->subscribedIcon().scaled( imgWidth, imgWidth, Qt::KeepAspectRatio, Qt::SmoothTransformation ); const QPixmap icon = plItem->subscribedIcon().scaled( imgWidth, imgWidth, Qt::KeepAspectRatio, Qt::SmoothTransformation );
const QRect subRect( optIndentation.rect.right() - padding - imgWidth, optIndentation.rect.top() + padding, imgWidth, imgWidth ); const QRect subRect( optIndentation.rect.right() - 4 - imgWidth, optIndentation.rect.top() + ( optIndentation.rect.height() - imgWidth ) / 2, imgWidth, imgWidth );
painter->drawPixmap( subRect, icon ); painter->drawPixmap( subRect, icon );
} }
if ( plItem->collaborative() ) if ( plItem->collaborative() )
{ {
const int padding = 2; const int imgWidth = optIndentation.rect.height() / 2;
const int imgWidth = optIndentation.rect.height() - 2 * padding;
const QRect subRect( optIndentation.rect.left(), optIndentation.rect.top(), imgWidth, imgWidth ); const QRect subRect( optIndentation.rect.left(), optIndentation.rect.top(), imgWidth, imgWidth );
painter->drawPixmap( subRect, TomahawkUtils::defaultPixmap( TomahawkUtils::GreenDot, TomahawkUtils::Original, subRect.size() ) ); painter->drawPixmap( subRect, TomahawkUtils::defaultPixmap( TomahawkUtils::GreenDot, TomahawkUtils::Original, subRect.size() ) );