| -rw-r--r-- | libopie/otabwidget.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index 5fc3e8e..1fee919 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp @@ -291,35 +291,42 @@ void OTabWidget::selectTab( OTabInfo *tab ) } void OTabWidget::setUpLayout() { tabBar->layoutTabs(); QSize t( tabBarStack->sizeHint() ); - if ( t.width() > width() ) + if ( tabBarStyle == IconTab ) + { + if ( t.width() > width() ) + t.setWidth( width() ); + } + else + { t.setWidth( width() ); + } int lw = widgetStack->lineWidth(); if ( tabBarPosition == Bottom ) { tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); } else { tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); - widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2)); + widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX( 0, lw-2 ) ); } if ( autoMask() ) updateMask(); } QSize OTabWidget::sizeHint() const { QSize s( widgetStack->sizeHint() ); QSize t( tabBarStack->sizeHint() ); - return QSize( QMAX( s.width(), t.width()), s.height() + t.height() ); + return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() ); } void OTabWidget::resizeEvent( QResizeEvent * ) { setUpLayout(); } |