From bb1a06a63621bff02edb46c177236030d0dc9085 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 12 Aug 2011 00:18:38 -0400 Subject: [PATCH] mac-specific tweaks --- src/libtomahawk/utils/tomahawkutils.cpp | 4 ++++ src/libtomahawk/widgets/welcomewidget.cpp | 23 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp index fdef729be..950e76ebe 100644 --- a/src/libtomahawk/utils/tomahawkutils.cpp +++ b/src/libtomahawk/utils/tomahawkutils.cpp @@ -380,6 +380,10 @@ drawBackgroundAndNumbers( QPainter* painter, const QString& text, const QRect& f painter->setPen( origpen ); +#ifdef Q_OS_MAC + figRect.adjust( -1, 0, 0, 0 ); +#endif + QTextOption to( Qt::AlignCenter ); painter->setPen( Qt::white ); painter->drawText( figRect.adjusted( -5, 0, 6, 0 ), text, to ); diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 8c423d6ad..21ffe2005 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -71,6 +71,9 @@ WelcomeWidget::WelcomeWidget( QWidget* parent ) ui->playlistWidget->setItemDelegate( new PlaylistDelegate() ); ui->playlistWidget->setModel( model ); ui->playlistWidget->overlay()->resize( 380, 86 ); +#ifdef Q_OS_MAC + ui->playlistWidget->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); +#endif connect( model, SIGNAL( emptinessChanged( bool) ), this, SLOT( updatePlaylists() ) ); @@ -219,7 +222,11 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, QTextOption to; to.setAlignment( Qt::AlignCenter ); QFont font = opt.font; - QFont boldFont = opt.font; +#ifdef Q_OS_MAC + font.setPointSize( font.pointSize() - 2 ); +#endif + + QFont boldFont = font; boldFont.setBold( true ); QPixmap icon; @@ -246,8 +253,20 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, } QColor c = painter->pen().color(); painter->setPen( QColor( Qt::gray ).darker() ); - painter->drawText( option.rect.adjusted( 66, 19, -100, -8 ), descText ); + QFont font2 = font; +#ifdef Q_OS_MAC + font2.setPointSize( font2.pointSize() - 1 ); +#endif + painter->setFont( font2 ); + + QRect rectText = option.rect.adjusted( 66, 20, -100, -8 ); +#ifdef Q_OS_MAC + rectText.adjust( 0, 1, 0, 0 ); +#endif + + painter->drawText( rectText, descText ); painter->setPen( c ); + painter->setFont( font ); if ( type != WelcomePlaylistModel::Station ) {