mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2025-01-07 16:28:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qt: remedy faulty locationBar layout

Browse Source
This commit is contained in:
Jakob Leben 2010-02-18 01:13:26 +01:00
parent cd22ae1dc6
commit 9af87f1184
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/gui/qt4/components/playlist/standardpanel.cpp
View File

@ -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 )
if( totalWidth <= size.width() || i == 0)
{
menuMore->addAction( actions[i] );
buttons[i]->hide();
}
else if( i > 0 && totalWidth > size.width() )
{
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];
}
}
}

1
modules/gui/qt4/components/playlist/standardpanel.hpp
View File

@ -152,6 +152,7 @@ private:
QList<QAction*> actions;
LocationButton *btnMore;
QMenu *menuMore;
QList<int> widths;
};
#endif