From 757d2691c1fdd3dd43f87cb78b5592e2b30ba664 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 21 Nov 2010 11:03:42 +0100
Subject: [PATCH] * Fixed some margins.

---
 src/audiocontrols.cpp     |  4 +++-
 src/audiocontrols.ui      | 14 ++++----------
 src/utils/elidedlabel.cpp |  1 +
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp
index c5633062f..770450511 100644
--- a/src/audiocontrols.cpp
+++ b/src/audiocontrols.cpp
@@ -26,7 +26,9 @@ AudioControls::AudioControls( QWidget* parent )
     ui->trackLabelLayout->setSpacing( 3 );
 
     QFont font( ui->artistTrackLabel->font() );
-//    font.setPixelSize( 12 );
+    font.setPixelSize( 12 );
+    ui->artistTrackLabel->setMinimumSize( ui->artistTrackLabel->minimumSizeHint() );
+    ui->albumLabel->setMinimumSize( ui->albumLabel->minimumSizeHint() );
 
     ui->artistTrackLabel->setFont( font );
     ui->artistTrackLabel->setElideMode( Qt::ElideMiddle );
diff --git a/src/audiocontrols.ui b/src/audiocontrols.ui
index 140d86764..6d1e54611 100644
--- a/src/audiocontrols.ui
+++ b/src/audiocontrols.ui
@@ -138,13 +138,13 @@
        <number>12</number>
       </property>
       <property name="topMargin">
-       <number>1</number>
+       <number>0</number>
       </property>
       <property name="rightMargin">
        <number>8</number>
       </property>
       <property name="bottomMargin">
-       <number>1</number>
+       <number>0</number>
       </property>
       <item>
        <widget class="QLabel" name="coverImage">
@@ -189,10 +189,10 @@
          <number>8</number>
         </property>
         <property name="topMargin">
-         <number>1</number>
+         <number>0</number>
         </property>
         <property name="bottomMargin">
-         <number>1</number>
+         <number>0</number>
         </property>
         <item>
          <widget class="QWidget" name="widget_2" native="true">
@@ -211,12 +211,6 @@
            </property>
            <item>
             <layout class="QVBoxLayout" name="trackLabelLayout">
-             <property name="topMargin">
-              <number>1</number>
-             </property>
-             <property name="bottomMargin">
-              <number>1</number>
-             </property>
              <item>
               <widget class="ElidedLabel" name="artistTrackLabel">
                <property name="cursor">
diff --git a/src/utils/elidedlabel.cpp b/src/utils/elidedlabel.cpp
index 795ec7bbc..8c581997c 100644
--- a/src/utils/elidedlabel.cpp
+++ b/src/utils/elidedlabel.cpp
@@ -87,6 +87,7 @@ ElidedLabel::init( const QString& txt )
     m_text = txt;
     align = Qt::AlignLeft;
     mode = Qt::ElideMiddle;
+    setContentsMargins( 0, 0, 0, 0 );
 }