From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 16 Dec 2007 00:09:01 +0000 (+0000)
Subject: Qt4 - Small interface and control layout fix.
X-Git-Tag: 0.9.0-test0~4086
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b6a1348f1d221436b0a92880b71be675d90fcabc;hp=de268c164c5e7ed4f05f06a12407a6aaa32411a6;p=vlc

Qt4 - Small interface and control layout fix.
---

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 8eaa7ad483..f9fe06a84c 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -371,7 +371,9 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 {
     controlLayout = new QGridLayout( this );
     controlLayout->setSpacing( 0 );
-    setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Minimum );
+    //controlLayout->setMargin( 0 );
+
+    setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum );
 
     /** The main Slider **/
     slider = new InputSlider( Qt::Horizontal, NULL );
@@ -456,8 +458,8 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     /* Play */
     playButton = new QPushButton;
     playButton->setSizePolicy( sizePolicy );
-    playButton->setMaximumSize( QSize( 38, 38 ) );
-    playButton->setMinimumSize( QSize( 45, 45 ) );
+    playButton->setMaximumSize( QSize( 36, 36 ) );
+    playButton->setMinimumSize( QSize( 36, 36 ) );
     playButton->setIconSize( QSize( 30, 30 ) );
 
     controlLayout->addWidget( playButton, 2, 0, 2, 2 );
@@ -499,8 +501,10 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() );
     BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
 
-    controlLayout->setColumnStretch( 7 , 2 );
-
+    controlLayout->setColumnMinimumWidth( 7, 20 );
+    controlLayout->setColumnStretch( 7, 0 );
+    controlLayout->setColumnStretch( 8, 0 );
+    controlLayout->setColumnStretch( 9, 0 );
     /*
      * Other first Line buttons
      */
@@ -524,6 +528,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     setupSmallButton( extSettingsButton );
     controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
 
+    controlLayout->setColumnStretch( 13, 0 );
     controlLayout->setColumnStretch( 14, 5 );
 
     /* Volume */
@@ -562,8 +567,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 }
 
 ControlsWidget::~ControlsWidget()
-{
-}
+{}
 
 /*
 QSize ControlsWidget::sizeHint() const
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 8c8243cd0b..4f64d38364 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -352,6 +352,7 @@ void MainInterface::handleMainUi( QSettings *settings )
 
     /* Margins, spacing */
     main->setContentsMargins( 0, 0, 0, 0 );
+    main->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
     mainLayout->setMargin( 0 );
 
     /* Create the CONTROLS Widget */