From 3f9c2366f29f4de721bbb47069924e72fe18b39e Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Mon, 17 Oct 2011 17:45:06 -0400 Subject: [PATCH] Consistent size for all headers in the view --- src/libtomahawk/utils/tomahawkutils.cpp | 20 +++++++++++++++++-- src/libtomahawk/utils/tomahawkutils.h | 3 +++ src/libtomahawk/widgets/HeaderLabel.cpp | 13 +++++++++--- src/libtomahawk/widgets/HeaderLabel.h | 2 ++ .../widgets/siblingcrumbbutton.cpp | 2 ++ src/tomahawkapp.cpp | 7 +++++++ src/tomahawkwindow.cpp | 2 ++ 7 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp index d1b26e5f7..09f47cf28 100644 --- a/src/libtomahawk/utils/tomahawkutils.cpp +++ b/src/libtomahawk/utils/tomahawkutils.cpp @@ -62,6 +62,9 @@ namespace TomahawkUtils { + +static int s_headerHeight = 0; + #ifdef Q_WS_MAC QString appSupportFolderPath() @@ -445,8 +448,8 @@ unmarginLayout( QLayout* layout ) } -QWeakPointer< QNetworkAccessManager > s_nam; -NetworkProxyFactory* s_proxyFactory = 0; +static QWeakPointer< QNetworkAccessManager > s_nam; +static NetworkProxyFactory* s_proxyFactory = 0; QList< QNetworkProxy > @@ -650,4 +653,17 @@ crash() *a = 1; } +int +headerHeight() +{ + return s_headerHeight; +} + +void +setHeaderHeight( int height ) +{ + s_headerHeight = height; +} + + } // ns diff --git a/src/libtomahawk/utils/tomahawkutils.h b/src/libtomahawk/utils/tomahawkutils.h index bf74180d6..513a855d8 100644 --- a/src/libtomahawk/utils/tomahawkutils.h +++ b/src/libtomahawk/utils/tomahawkutils.h @@ -101,6 +101,9 @@ namespace TomahawkUtils DLLEXPORT QPixmap createAvatarFrame( const QPixmap &avatar ); DLLEXPORT void crash(); + + DLLEXPORT int headerHeight(); + DLLEXPORT void setHeaderHeight( int height ); } #endif // TOMAHAWKUTILS_H diff --git a/src/libtomahawk/widgets/HeaderLabel.cpp b/src/libtomahawk/widgets/HeaderLabel.cpp index bdd033b05..5f5e78c2e 100644 --- a/src/libtomahawk/widgets/HeaderLabel.cpp +++ b/src/libtomahawk/widgets/HeaderLabel.cpp @@ -23,9 +23,10 @@ #include "utils/logger.h" #include "utils/stylehelper.h" +#include "utils/tomahawkutils.h" -#define FONT_SIZE 16 +static const int s_defaultFontSize = 12; HeaderLabel::HeaderLabel( QWidget* parent ) : QLabel( parent ) @@ -33,10 +34,10 @@ HeaderLabel::HeaderLabel( QWidget* parent ) { QFont f( font() ); f.setBold( true ); - f.setPixelSize( 12 ); + f.setPixelSize( s_defaultFontSize ); setFont( f ); - setFixedHeight( sizeHint().height() + 8 ); + setFixedHeight( TomahawkUtils::headerHeight() ); } @@ -51,6 +52,12 @@ HeaderLabel::sizeHint() const return QLabel::sizeHint(); } +int +HeaderLabel::defaultFontSize() +{ + return s_defaultFontSize; +} + void HeaderLabel::mousePressEvent( QMouseEvent* event ) diff --git a/src/libtomahawk/widgets/HeaderLabel.h b/src/libtomahawk/widgets/HeaderLabel.h index 7bcb94f27..3cdecb176 100644 --- a/src/libtomahawk/widgets/HeaderLabel.h +++ b/src/libtomahawk/widgets/HeaderLabel.h @@ -39,6 +39,8 @@ public: QSize minimumSizeHint() const { return sizeHint(); } QSize sizeHint() const; + static int defaultFontSize(); + signals: void clicked(); diff --git a/src/libtomahawk/widgets/siblingcrumbbutton.cpp b/src/libtomahawk/widgets/siblingcrumbbutton.cpp index 537d62fc7..f11704aac 100644 --- a/src/libtomahawk/widgets/siblingcrumbbutton.cpp +++ b/src/libtomahawk/widgets/siblingcrumbbutton.cpp @@ -20,6 +20,7 @@ #include "combobox.h" #include "utils/stylehelper.h" +#include "utils/tomahawkutils.h" #include #include @@ -37,6 +38,7 @@ SiblingCrumbButton::SiblingCrumbButton( : BreadcrumbButtonBase(parent), m_index(index), m_combo( new ComboBox(this) ) { + setFixedHeight( TomahawkUtils::headerHeight() ); m_combo->setSizeAdjustPolicy( QComboBox::AdjustToContents ); setIndex(index); connect(m_combo, SIGNAL(activated(int)), SLOT(comboboxActivated(int))); diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 2d90e75f1..198db098a 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -1,6 +1,7 @@ /* === This file is part of Tomahawk Player - === * * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2010-2011, Leo Franchi * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,6 +58,7 @@ #include "utils/spotifyparser.h" #include "dropjob.h" #include "EchonestCatalogSynchronizer.h" +#include "widgets/HeaderLabel.h" #include "audio/audioengine.h" #include "utils/xspfloader.h" @@ -148,6 +150,11 @@ TomahawkApp::init() setQuitOnLastWindowClosed( false ); #endif + QFont f = APP->font(); + f.setPixelSize( HeaderLabel::defaultFontSize() ); + QFontMetrics fm( f ); + TomahawkUtils::setHeaderHeight( fm.height() + 8 ); + registerMetaTypes(); new TomahawkSettings( this ); diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index 6c033668b..01169cd3c 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -1,6 +1,7 @@ /* === This file is part of Tomahawk Player - === * * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2010-2011, Leo Franchi * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,6 +70,7 @@ #include "utils/logger.h" #include "jobview/JobStatusModel.h" #include "LoadXSPFDialog.h" +#include using namespace Tomahawk;