From 43ed58f66eb4ee9539f441965e4cfa79feb86a48 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 8 Sep 2014 17:51:27 +0200
Subject: [PATCH] * Only apply scaling once per widget.

---
 src/libtomahawk/playlist/TrackDetailView.cpp | 2 +-
 src/libtomahawk/utils/TomahawkUtilsGui.cpp   | 5 ++++-
 src/libtomahawk/widgets/BasicHeader.cpp      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libtomahawk/playlist/TrackDetailView.cpp b/src/libtomahawk/playlist/TrackDetailView.cpp
index 25b83a337..682e982f0 100644
--- a/src/libtomahawk/playlist/TrackDetailView.cpp
+++ b/src/libtomahawk/playlist/TrackDetailView.cpp
@@ -42,7 +42,7 @@ TrackDetailView::TrackDetailView( QWidget* parent )
     : QWidget( parent )
     , DpiScaler( this )
 {
-    setFixedWidth( scaledX( 210 ) );
+    setFixedWidth( scaledX( 200 ) );
     setContentsMargins( 0, 0, 0, 0 );
 
     QPalette pal( palette() );
diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
index 5c8566adf..b2ce70fcd 100644
--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
@@ -234,10 +234,14 @@ unmarginLayout( QLayout* layout )
 void
 fixLayoutMargins( QLayout* layout, QWidget* parent )
 {
+    if ( parent->property( "scalingDone" ).toBool() )
+        return;
+
     DpiScaler scaler( parent );
     layout->setContentsMargins( scaler.scaled( layout->contentsMargins() ) );
     layout->setSpacing( scaler.scaledX( layout->spacing() ) );
 
+    parent->setProperty( "scalingDone", true );
     parent->setContentsMargins( scaler.scaled( parent->contentsMargins() ) );
 
     for ( int i = 0; i < layout->count(); i++ )
@@ -252,7 +256,6 @@ fixLayoutMargins( QLayout* layout, QWidget* parent )
 void
 fixMargins( QWidget* widget )
 {
-    tDebug() << "FIX MARGINS Found widget:" << widget->objectName() << widget;
     if ( widget->layout() )
     {
         fixLayoutMargins( widget->layout(), widget );
diff --git a/src/libtomahawk/widgets/BasicHeader.cpp b/src/libtomahawk/widgets/BasicHeader.cpp
index 40c34a61d..29dcb7619 100644
--- a/src/libtomahawk/widgets/BasicHeader.cpp
+++ b/src/libtomahawk/widgets/BasicHeader.cpp
@@ -76,7 +76,7 @@ BasicHeader::BasicHeader( QWidget* parent )
         ui->anchor3Label->setPalette( p );
     }
 
-    setFixedHeight( scaledY( 140 ) );
+    setFixedHeight( scaledY( 130 ) );
     TomahawkUtils::fixMargins( this );
 }