author | drw <drw> | 2002-11-22 01:13:36 (UTC) |
---|---|---|
committer | drw <drw> | 2002-11-22 01:13:36 (UTC) |
commit | 380dc82f6e03f1357e91c0c6e3dd48bcc38969a5 (patch) (unidiff) | |
tree | 3b23d8b7afe2f6a9f77c9700ffe812f349f21628 | |
parent | 1c2a0db4c2454a36ebf5c676f8ce803b285e60b8 (diff) | |
download | opie-380dc82f6e03f1357e91c0c6e3dd48bcc38969a5.zip opie-380dc82f6e03f1357e91c0c6e3dd48bcc38969a5.tar.gz opie-380dc82f6e03f1357e91c0c6e3dd48bcc38969a5.tar.bz2 |
Hopefully corrects bug #467
-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 | |||
@@ -293,10 +293,17 @@ void OTabWidget::selectTab( OTabInfo *tab ) | |||
293 | void OTabWidget::setUpLayout() | 293 | void OTabWidget::setUpLayout() |
294 | { | 294 | { |
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 ) |
301 | { | 308 | { |
302 | tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); | 309 | tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); |
@@ -304,9 +311,9 @@ void OTabWidget::setUpLayout() | |||
304 | } | 311 | } |
305 | else | 312 | else |
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 | ||
311 | if ( autoMask() ) | 318 | if ( autoMask() ) |
312 | updateMask(); | 319 | updateMask(); |
@@ -315,9 +322,9 @@ void OTabWidget::setUpLayout() | |||
315 | QSize OTabWidget::sizeHint() const | 322 | QSize OTabWidget::sizeHint() const |
316 | { | 323 | { |
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 | ||
322 | void OTabWidget::resizeEvent( QResizeEvent * ) | 329 | void OTabWidget::resizeEvent( QResizeEvent * ) |
323 | { | 330 | { |