mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

* Hopefully improved sidebar delegate.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-05-14 11:50:09 +02:00
parent 85236c5c62
commit 5ddd730c4c
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/sourcetree/SourceDelegate.cpp
View File

@@ -224,9 +224,12 @@ SourceDelegate::paintCollection( QPainter* painter, const QStyleOptionViewItem&
painter->drawPixmap( iconRect, avatar ); painter->drawPixmap( iconRect, avatar );
if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected ) QColor descColor = option.palette.color( QPalette::Text ).lighter( 180 );
if ( type == SourcesModel::ScriptCollection && //you cannot select a non-script collection anyway
option.state.testFlag( QStyle::State_Selected ) )
{ {
painter->setPen( option.palette.color( QPalette::HighlightedText ) ); painter->setPen( option.palette.color( QPalette::HighlightedText ) );
descColor = option.palette.color( QPalette::HighlightedText );
} }
QRect textRect = option.rect.adjusted( iconRect.width() + 8, 6, -figWidth - ( figWidth ? 28 : 0 ), 0 ); QRect textRect = option.rect.adjusted( iconRect.width() + 8, 6, -figWidth - ( figWidth ? 28 : 0 ), 0 );
@@ -237,13 +240,6 @@ SourceDelegate::paintCollection( QPainter* painter, const QStyleOptionViewItem&
painter->drawText( textRect, text, to ); painter->drawText( textRect, text, to );
} }
QColor descColor = option.palette.color( QPalette::Text ).lighter( 180 );
if ( type == SourcesModel::ScriptCollection && //you cannot select a non-script collection anyway
option.state.testFlag( QStyle::State_Selected ) )
{
descColor = option.palette.color( QPalette::HighlightedText );
}
painter->setFont( normal ); painter->setFont( normal );
textRect = option.rect.adjusted( iconRect.width() + 8, option.rect.height() / 2, -figWidth - ( figWidth ? 24 : 0 ), -6 ); textRect = option.rect.adjusted( iconRect.width() + 8, option.rect.height() / 2, -figWidth - ( figWidth ? 24 : 0 ), -6 );
@@ -446,7 +442,7 @@ SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& optio
void void
SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{ {
QStyleOptionViewItem o = option; QStyleOptionViewItemV4 o = option;
QStyleOptionViewItemV4 o3 = option; QStyleOptionViewItemV4 o3 = option;
painter->save(); painter->save();
@@ -462,7 +458,6 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
if ( ( option.state & QStyle::State_MouseOver ) == QStyle::State_MouseOver ) if ( ( option.state & QStyle::State_MouseOver ) == QStyle::State_MouseOver )
{ {
o.state |= QStyle::State_MouseOver; o.state |= QStyle::State_MouseOver;
o3.state |= QStyle::State_MouseOver;
} }
if ( ( option.state & QStyle::State_Open ) == QStyle::State_Open ) if ( ( option.state & QStyle::State_Open ) == QStyle::State_Open )
@@ -476,19 +471,16 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
{ {
if ( type == SourcesModel::ScriptCollection ) if ( type == SourcesModel::ScriptCollection )
o.state |= QStyle::State_Selected; o.state |= QStyle::State_Selected;
o3.state |= QStyle::State_Selected;
}
else
{
o3.state &= ~QStyle::State_Selected;
} }
o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) ); o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
o3.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
} }
} }
initStyleOption( &o3, index );
o3.icon = QIcon();
o3.text.clear();
// shrink the indentations // shrink the indentations
{ {
int indentMult = 0; int indentMult = 0;