From 047f670980cf8828e57a5f5095c35b1c4f7b532d Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 1 Sep 2012 16:46:04 +0200
Subject: [PATCH] * Set a different default size on OSX.

---
 src/TomahawkApp.cpp                       |  7 ++++++-
 src/libtomahawk/context/ContextWidget.cpp | 11 ++---------
 src/libtomahawk/playlist/QueueView.cpp    |  5 +----
 src/sourcetree/SourceTreeView.cpp         |  3 ---
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp
index 852af93e6..45058fcb8 100644
--- a/src/TomahawkApp.cpp
+++ b/src/TomahawkApp.cpp
@@ -196,8 +196,13 @@ TomahawkApp::init()
     setQuitOnLastWindowClosed( false );
 
     QFont f = font();
+#ifdef Q_OS_MAC
+    f.setPointSize( f.pointSize() - 2 );
+    setFont( f );
+#endif
+
     tDebug() << "Default font:" << f.pixelSize() << f.pointSize() << f.pointSizeF() << f.family();
-    tDebug() << "Font heights:" << QFontMetrics( f ).height();
+    tDebug() << "Font height:" << QFontMetrics( f ).height();
     TomahawkUtils::setDefaultFontSize( f.pointSize() );
 #endif
 
diff --git a/src/libtomahawk/context/ContextWidget.cpp b/src/libtomahawk/context/ContextWidget.cpp
index d1d6849e2..5672bc52b 100644
--- a/src/libtomahawk/context/ContextWidget.cpp
+++ b/src/libtomahawk/context/ContextWidget.cpp
@@ -85,15 +85,8 @@ ContextWidget::ContextWidget( QWidget* parent )
     ui->toggleButton->setPalette( whitePal );
     ui->toggleButton->setCursor( Qt::PointingHandCursor );
 
-    QFont boldFont = ui->toggleButton->font();
-    boldFont.setPointSize( 10 );
-    boldFont.setBold( true );
-    ui->toggleButton->setFont( boldFont );
-    QFontMetrics fm( boldFont );
-
-    m_minHeight = fm.height() * 1.2;
-
-    ui->toggleButton->setMinimumHeight( fm.height() * 1.2 );
+    m_minHeight = TomahawkUtils::defaultFontHeight() * 1.4;
+    ui->toggleButton->setMinimumHeight( m_minHeight );
 
     setAutoFillBackground( true );
     setFixedHeight( m_minHeight );
diff --git a/src/libtomahawk/playlist/QueueView.cpp b/src/libtomahawk/playlist/QueueView.cpp
index 80fe8aaa5..5eaca075a 100644
--- a/src/libtomahawk/playlist/QueueView.cpp
+++ b/src/libtomahawk/playlist/QueueView.cpp
@@ -41,10 +41,7 @@ QueueView::QueueView( AnimatedSplitter* parent )
     TomahawkUtils::unmarginLayout( layout() );
     setContentsMargins( 0, 0, 0, 0 );
 
-    QFont f;
-    f.setPointSize( 10 );
-    QFontMetrics fm( f );
-    setHiddenSize( QSize( 0,  fm.height() * 1.2 ) );
+    setHiddenSize( QSize( 0, TomahawkUtils::defaultFontHeight() * 1.4 ) );
 
     ui->queue->setProxyModel( new QueueProxyModel( ui->queue ) );
     ui->queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
diff --git a/src/sourcetree/SourceTreeView.cpp b/src/sourcetree/SourceTreeView.cpp
index a5875e6c6..cfb3bb0f9 100644
--- a/src/sourcetree/SourceTreeView.cpp
+++ b/src/sourcetree/SourceTreeView.cpp
@@ -69,9 +69,6 @@ SourceTreeView::SourceTreeView( QWidget* parent )
     setContentsMargins( 0, 0, 0, 0 );
 
     QFont fnt;
-    fnt.setPointSize( TomahawkUtils::defaultFontSize() - 2 );
-    setFont( fnt );
-
     QFontMetrics fm( fnt );
     // This is sort of the longest string in there. With translations
     // we will never get it right so setting it to something reasonable for the average case