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

try with pointsizes instead of scaling pixelsizes

Browse Source
This commit is contained in:
Michael Zanetti
2012-07-17 22:17:17 +02:00
parent a1f82f38bd
commit 2a7fabf633
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sourcetree/SourceDelegate.cpp
View File

@@ -90,7 +90,7 @@ SourceDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex&
if ( type == SourcesModel::Collection ) if ( type == SourcesModel::Collection )
{ {
// return QSize( option.rect.width(), 40 ); // return QSize( option.rect.width(), 40 );
return QSize( option.rect.width(), option.fontMetrics.height() * 2.5 ); return QSize( option.rect.width(), option.fontMetrics.height() * 2.6 );
} }
else if ( type == SourcesModel::Divider ) else if ( type == SourcesModel::Divider )
{ {
@@ -100,7 +100,7 @@ SourceDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex&
else if ( type == SourcesModel::Group ) else if ( type == SourcesModel::Group )
{ {
// return QSize( option.rect.width(), 26 ); // return QSize( option.rect.width(), 26 );
int groupSpacer = index.row() > 0 ? option.fontMetrics.height() / 2 : 0; int groupSpacer = index.row() > 0 ? option.fontMetrics.height() * 0.6 : option.fontMetrics.height() * 0.2;
return QSize( option.rect.width(), option.fontMetrics.height() + groupSpacer ); return QSize( option.rect.width(), option.fontMetrics.height() + groupSpacer );
} }
else if ( m_expandedMap.contains( index ) ) else if ( m_expandedMap.contains( index ) )
@@ -167,7 +167,7 @@ SourceDelegate::paintCollection( QPainter* painter, const QStyleOptionViewItem&
figFont.setFamily( "Arial Bold" ); figFont.setFamily( "Arial Bold" );
figFont.setWeight( QFont::Black ); figFont.setWeight( QFont::Black );
//figFont.setPixelSize( 10 ); //figFont.setPixelSize( 10 );
figFont.setPixelSize( option.fontMetrics.height() * 0.7 ); figFont.setPointSize( 7 );
SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >(); SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
SourceItem* colItem = qobject_cast< SourceItem* >( item ); SourceItem* colItem = qobject_cast< SourceItem* >( item );
@@ -303,7 +303,7 @@ SourceDelegate::paintCategory( QPainter* painter, const QStyleOptionViewItem& op
QFont font = painter->font(); QFont font = painter->font();
//font.setPixelSize( 11 ); //font.setPixelSize( 11 );
font.setPixelSize( option.fontMetrics.height() * 0.7 ); font.setPointSize( 8 );
font.setBold( true ); font.setBold( true );
painter->setFont( font ); painter->setFont( font );
QTextOption to( Qt::AlignVCenter | Qt::AlignRight ); QTextOption to( Qt::AlignVCenter | Qt::AlignRight );
@@ -322,7 +322,7 @@ SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& optio
{ {
QFont font = painter->font(); QFont font = painter->font();
// font.setPixelSize( 12 ); // font.setPixelSize( 12 );
font.setPixelSize( option.fontMetrics.height() * 0.8 ); font.setPointSize( 9 );
font.setBold( true ); font.setBold( true );
painter->setFont( font ); painter->setFont( font );
@@ -344,7 +344,8 @@ SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& optio
if ( option.state & QStyle::State_Open ) if ( option.state & QStyle::State_Open )
text = tr( "Hide" ); text = tr( "Hide" );
font.setPixelSize( font.pixelSize() - 1 ); QFont tmpFont = font;
font.setPointSize( font.pointSize() - 1 );
painter->setFont( font ); painter->setFont( font );
QTextOption to( Qt::AlignBottom | Qt::AlignRight ); QTextOption to( Qt::AlignBottom | Qt::AlignRight );
@@ -353,6 +354,7 @@ SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& optio
painter->drawText( option.rect.translated( -4, 1 ), text, to ); painter->drawText( option.rect.translated( -4, 1 ), text, to );
painter->setPen( QColor( 99, 113, 128 ) ); painter->setPen( QColor( 99, 113, 128 ) );
painter->drawText( option.rect.translated( -4, 0 ), text, to ); painter->drawText( option.rect.translated( -4, 0 ), text, to );
painter->setFont( tmpFont );
} }
} }
@@ -367,7 +369,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
QFont font = painter->font(); QFont font = painter->font();
// font.setPixelSize( 11 ); // font.setPixelSize( 11 );
font.setPixelSize( option.fontMetrics.height() * 0.75 ); font.setPointSize( 8 );
painter->setFont( font ); painter->setFont( font );
o.font = font; o.font = font;
o3.font = font; o3.font = font;
@@ -467,7 +469,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
QFont font = painter->font(); QFont font = painter->font();
// font.setPixelSize( 12 ); // font.setPixelSize( 12 );
font.setPixelSize( option.fontMetrics.height() * 0.8 ); font.setPointSize( 9 );
painter->setFont( font ); painter->setFont( font );
QFont fontBold = painter->font(); QFont fontBold = painter->font();
fontBold.setBold( true ); fontBold.setBold( true );