From 53863e91554aa7da5f25276cfca336c17721d004 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 18 Jul 2012 19:36:40 +0200 Subject: [PATCH] fixed font sizes in the context page --- src/libtomahawk/context/ContextPage.cpp | 11 ++++++++--- src/libtomahawk/context/ContextWidget.cpp | 9 +++++++-- src/libtomahawk/context/ContextWidget.ui | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/context/ContextPage.cpp b/src/libtomahawk/context/ContextPage.cpp index cc1aca64d..6e34f277e 100644 --- a/src/libtomahawk/context/ContextPage.cpp +++ b/src/libtomahawk/context/ContextPage.cpp @@ -38,11 +38,12 @@ ContextProxyPage::paint( QPainter* painter, const QStyleOptionGraphicsItem* opti QFont f( font() ); f.setBold( true ); - f.setPixelSize( 14 ); + f.setPointSize( 8 ); painter->setFont( f ); painter->setPen( Qt::white ); - QRect r( 1, 1, option->rect.width(), 19 ); + QFontMetrics fm( f ); + QRect r( 1, 1, option->rect.width(), fm.height() * 1.1 ); QTextOption to( Qt::AlignCenter ); painter->drawText( r, m_page->title(), to ); @@ -65,8 +66,12 @@ ContextProxyPage::setPage( Tomahawk::ContextPage* page ) } #endif + QFont f( font() ); + f.setBold( true ); + f.setPointSize( 8 ); + QFontMetrics fm( f ); QGraphicsLinearLayout* layout = new QGraphicsLinearLayout(); - layout->setContentsMargins( 4, 20, 4, 4 ); + layout->setContentsMargins( 4, fm.height() * 1.1, 4, 4 ); layout->addItem( page->widget() ); setLayout( layout ); diff --git a/src/libtomahawk/context/ContextWidget.cpp b/src/libtomahawk/context/ContextWidget.cpp index bbf0e8334..a60223d88 100644 --- a/src/libtomahawk/context/ContextWidget.cpp +++ b/src/libtomahawk/context/ContextWidget.cpp @@ -43,7 +43,6 @@ using namespace Tomahawk; ContextWidget::ContextWidget( QWidget* parent ) : QWidget( parent ) , ui( new Ui::ContextWidget ) - , m_minHeight( 22 ) , m_currentView( 0 ) , m_visible( false ) { @@ -86,9 +85,15 @@ ContextWidget::ContextWidget( QWidget* parent ) ui->toggleButton->setPalette( whitePal ); QFont boldFont = ui->toggleButton->font(); - boldFont.setPixelSize( 12 ); + //boldFont.setPixelSize( 12 ); + boldFont.setPointSize( 10 ); boldFont.setBold( true ); ui->toggleButton->setFont( boldFont ); + QFontMetrics fm( boldFont ); + + m_minHeight = fm.height() * 1.1; + + ui->toggleButton->setMinimumHeight( fm.height() ); setAutoFillBackground( true ); setFixedHeight( m_minHeight ); diff --git a/src/libtomahawk/context/ContextWidget.ui b/src/libtomahawk/context/ContextWidget.ui index 77a9f2fe8..5282df4ad 100644 --- a/src/libtomahawk/context/ContextWidget.ui +++ b/src/libtomahawk/context/ContextWidget.ui @@ -7,7 +7,7 @@ 0 0 774 - 72 + 173