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

* Potential fix for TWK-422: Disappearing (white on white) sidebar items for some styles (e.g. gtk/gnome).

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-11-28 15:43:28 +01:00
parent 5c380b0b8c
commit f4d1bc8dfb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sourcetree/sourcedelegate.cpp
View File

@@ -109,6 +109,7 @@ 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; QStyleOptionViewItem o = option;
QStyleOptionViewItemV4 o3 = option;
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
QFont savedFont = painter->font(); QFont savedFont = painter->font();
@@ -121,10 +122,13 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
if ( ( option.state & QStyle::State_Enabled ) == QStyle::State_Enabled ) if ( ( option.state & QStyle::State_Enabled ) == QStyle::State_Enabled )
{ {
o.state = QStyle::State_Enabled; o.state = QStyle::State_Enabled;
o3.state = QStyle::State_Enabled;
if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected ) if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected )
{ {
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 ) );
} }
} }
@@ -132,7 +136,6 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >(); SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
Q_ASSERT( item ); Q_ASSERT( item );
QStyleOptionViewItemV4 o3 = option;
if ( type != SourcesModel::Collection && type != SourcesModel::Category ) if ( type != SourcesModel::Collection && type != SourcesModel::Category )
o3.rect.setX( 0 ); o3.rect.setX( 0 );
@@ -413,7 +416,6 @@ SourceDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewIte
bool bool
SourceDelegate::editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index ) SourceDelegate::editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
{ {
if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonPress ) if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonPress )
{ {
SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() ); SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );