-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 | |||
@@ -295,6 +295,13 @@ void OTabWidget::setUpLayout() | |||
295 | tabBar->layoutTabs(); | 295 | tabBar->layoutTabs(); |
296 | QSize t( tabBarStack->sizeHint() ); | 296 | QSize t( tabBarStack->sizeHint() ); |
297 | if ( t.width() > width() ) | 297 | if ( tabBarStyle == IconTab ) |
298 | { | ||
299 | if ( t.width() > width() ) | ||
300 | t.setWidth( width() ); | ||
301 | } | ||
302 | else | ||
303 | { | ||
298 | t.setWidth( width() ); | 304 | t.setWidth( width() ); |
305 | } | ||
299 | int lw = widgetStack->lineWidth(); | 306 | int lw = widgetStack->lineWidth(); |
300 | if ( tabBarPosition == Bottom ) | 307 | if ( tabBarPosition == Bottom ) |
@@ -306,5 +313,5 @@ void OTabWidget::setUpLayout() | |||
306 | { | 313 | { |
307 | tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); | 314 | tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); |
308 | widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2)); | 315 | widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX( 0, lw-2 ) ); |
309 | } | 316 | } |
310 | 317 | ||
@@ -317,5 +324,5 @@ QSize OTabWidget::sizeHint() const | |||
317 | QSize s( widgetStack->sizeHint() ); | 324 | QSize s( widgetStack->sizeHint() ); |
318 | QSize t( tabBarStack->sizeHint() ); | 325 | QSize t( tabBarStack->sizeHint() ); |
319 | return QSize( QMAX( s.width(), t.width()), s.height() + t.height() ); | 326 | return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() ); |
320 | } | 327 | } |
321 | 328 | ||