Hopefully corrects bug #467

1 files changed, 7 insertions, 0 deletions

diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index 5fc3e8e..1fee919 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -201,134 +201,141 @@ void OTabWidget::setCurrentTab( const QString &tabname )
     }
 }
 
 void OTabWidget::setCurrentTab(int tabindex) {
     OTabInfo *newtab = tabs.first();
     while ( newtab && newtab->id() != tabindex )
     {
         newtab = tabs.next();
     }
     if ( newtab && newtab->id() == tabindex )
     {
         selectTab( newtab );
     }
 }
 
 
 OTabWidget::TabStyle OTabWidget::tabStyle() const
 {
     return tabBarStyle;
 }
 
 void OTabWidget::setTabStyle( TabStyle s )
 {
     tabBarStyle = s;
 }
 
 OTabWidget::TabPosition OTabWidget::tabPosition() const
 {
     return tabBarPosition;
 }
 
 void OTabWidget::setTabPosition( TabPosition p )
 {
     tabBarPosition = p;
 }
 
 void OTabWidget::slotTabBarSelected( int id )
 {
     OTabInfo *newtab = tabs.first();
     while ( newtab && newtab->id() != id )
     {
         newtab = tabs.next();
     }
     if ( newtab && newtab->id() == id )
     {
         selectTab( newtab );
     }
 }
 
 void OTabWidget::slotTabListSelected( int index )
 {
     OTabInfo *newtab = tabs.at( index );
     if ( newtab )
     {
         selectTab( newtab );
     }
 }
 
 QPixmap OTabWidget::loadSmooth( const QString &name )
 {
     QImage image = Resource::loadImage( name );
     QPixmap pixmap;
     pixmap.convertFromImage( image.smoothScale( 16, 16 ) );
     return pixmap;
 }
 
 void OTabWidget::selectTab( OTabInfo *tab )
 {
     if ( tabBarStyle == IconTab )
     {
         if ( currentTab )
         {
             tabBar->tab( currentTab->id() )->setText( "" );
             setUpLayout();
         }
         tabBar->tab( tab->id() )->setText( tab->label() );
         tabBar->setCurrentTab( tab->id() );
         setUpLayout();
         tabBar->update();
     }
     else
     {
         tabBar->setCurrentTab( tab->id() );
     }
 
     widgetStack->raiseWidget( tab->control() );
 
     emit currentChanged( tab->control() );
 
     currentTab = tab;
 }
 
 void OTabWidget::setUpLayout()
 {
     tabBar->layoutTabs();
     QSize t( tabBarStack->sizeHint() );
+    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));
     }
 
     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() );
 }
 
 void OTabWidget::resizeEvent( QResizeEvent * )
 {
     setUpLayout();
 }
 
 int OTabWidget::getCurrentTab() {
     if ( currentTab )
       {
           return currentTab->id();            
       }
     return -1;
 }