Qt: remedy faulty locationBar layout

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 4ceeaeba22a2fcd2182b4ef776b054136f543cef..bc4a001bc296b8c86a2d946af346d8e01319269e 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -521,24 +521,22 @@ void LocationBar::invoke( int i_id )
 void LocationBar::layOut( const QSize& size )
 {
     menuMore->clear();
+    widths.clear();
 
     int count = buttons.count();
-    QList<int> widths;
     int totalWidth = 0;
     for( int i = 0; i < count; i++ )
     {
         int w = buttons[i]->sizeHint().width();
-        if( i == 0 || totalWidth + w <= size.width() )
-        {
-            totalWidth += w;
-            widths.append( w );
-        }
+        widths.append( w );
+        totalWidth += w;
         if( totalWidth > size.width() ) break;
     }
 
     int x = 0;
     int shown = widths.count();
-    if( shown < count )
+
+    if( totalWidth > size.width() && count > 1 )
     {
         QSize sz = btnMore->sizeHint();
         btnMore->setGeometry( 0, 0, sz.width(), size.height() );
@@ -550,28 +548,20 @@ void LocationBar::layOut( const QSize& size )
     {
         btnMore->hide();
     }
-    shown--;
     for( int i = count - 1; i >= 0; i-- )
     {
-        if( i > shown )
-        {
-            menuMore->addAction( actions[i] );
-            buttons[i]->hide();
-        }
-        else if( i > 0 && totalWidth > size.width() )
+        if( totalWidth <= size.width() || i == 0)
         {
-            menuMore->addAction( actions[i] );
-            buttons[i]->hide();
+            buttons[i]->setGeometry( x, 0, qMin( size.width() - x, widths[i] ), size.height() );
+            buttons[i]->show();
+            x += widths[i];
             totalWidth -= widths[i];
         }
         else
         {
-            buttons[i]->setGeometry( x, 0,
-                                    qMin( widths[i], size.width() - x ),
-                                    size.height() );
-            buttons[i]->show();
-            totalWidth -= widths[i];
-            x += widths[i];
+            menuMore->addAction( actions[i] );
+            buttons[i]->hide();
+            if( i < shown ) totalWidth -= widths[i];
         }
     }
 }

diff --git a/modules/gui/qt4/components/playlist/standardpanel.hpp b/modules/gui/qt4/components/playlist/standardpanel.hpp
index 66fb61362ac6b0e34639d6bf8f3fcc5b6e538888..ab1cd0302dd052ab70b80268ed836bf9b6089275 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.hpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.hpp
@@ -152,6 +152,7 @@ private:
     QList<QAction*> actions;
     LocationButton *btnMore;
     QMenu *menuMore;
+    QList<int> widths;
 };
 
 #endif