author | alwin <alwin> | 2004-11-08 23:09:11 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-11-08 23:09:11 (UTC) |
commit | 4638c11f127d420818e2356359ae6f2223fb4407 (patch) (unidiff) | |
tree | 423eabc9469964ced331b04aa51730f13de0b062 | |
parent | 1480f96170cb7cd7c262a14ad56ff08f384de10f (diff) | |
download | opie-4638c11f127d420818e2356359ae6f2223fb4407.zip opie-4638c11f127d420818e2356359ae6f2223fb4407.tar.gz opie-4638c11f127d420818e2356359ae6f2223fb4407.tar.bz2 |
ui. in BigScreenmode it had an deep recursion in layout setup. I had
just commented out that line (353) - it seems to work now, but I'm not sure
if it is correct.
I think, this widget should be checked carefully.
-rw-r--r-- | libopie2/opieui/otabwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp index d23b1c9..80a4c9b 100644 --- a/libopie2/opieui/otabwidget.cpp +++ b/libopie2/opieui/otabwidget.cpp | |||
@@ -321,65 +321,65 @@ void OTabWidget::slotTabBarSelected( int id ) | |||
321 | { | 321 | { |
322 | selectTab( newtab ); | 322 | selectTab( newtab ); |
323 | } | 323 | } |
324 | } | 324 | } |
325 | 325 | ||
326 | void OTabWidget::slotTabListSelected( int index ) | 326 | void OTabWidget::slotTabListSelected( int index ) |
327 | { | 327 | { |
328 | OTabInfo *newtab = tabs.at( index ); | 328 | OTabInfo *newtab = tabs.at( index ); |
329 | if ( newtab ) | 329 | if ( newtab ) |
330 | { | 330 | { |
331 | selectTab( newtab ); | 331 | selectTab( newtab ); |
332 | } | 332 | } |
333 | } | 333 | } |
334 | 334 | ||
335 | QPixmap OTabWidget::loadSmooth( const QString &name ) | 335 | QPixmap OTabWidget::loadSmooth( const QString &name ) |
336 | { | 336 | { |
337 | QPixmap p; | 337 | QPixmap p; |
338 | p.convertFromImage( Resource::loadImage( name ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 338 | p.convertFromImage( Resource::loadImage( name ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
339 | return p; | 339 | return p; |
340 | } | 340 | } |
341 | 341 | ||
342 | void OTabWidget::selectTab( OTabInfo *tab ) | 342 | void OTabWidget::selectTab( OTabInfo *tab ) |
343 | { | 343 | { |
344 | if ( tabBarStyle == IconTab ) | 344 | if ( tabBarStyle == IconTab ) |
345 | { | 345 | { |
346 | if ( currTab ) | 346 | if ( currTab ) |
347 | { | 347 | { |
348 | tabBar->tab( currTab->id() )->setText( QString::null ); | 348 | tabBar->tab( currTab->id() )->setText( QString::null ); |
349 | setUpLayout(); | 349 | setUpLayout(); |
350 | } | 350 | } |
351 | tabBar->tab( tab->id() )->setText( tab->label() ); | 351 | tabBar->tab( tab->id() )->setText( tab->label() ); |
352 | tabBar->setCurrentTab( tab->id() ); | 352 | tabBar->setCurrentTab( tab->id() ); |
353 | setUpLayout(); | 353 | // setUpLayout(); |
354 | tabBar->update(); | 354 | tabBar->update(); |
355 | } | 355 | } |
356 | else | 356 | else |
357 | { | 357 | { |
358 | tabBar->setCurrentTab( tab->id() ); | 358 | tabBar->setCurrentTab( tab->id() ); |
359 | } | 359 | } |
360 | 360 | ||
361 | widgetStack->raiseWidget( tab->control() ); | 361 | widgetStack->raiseWidget( tab->control() ); |
362 | 362 | ||
363 | emit currentChanged( tab->control() ); | 363 | emit currentChanged( tab->control() ); |
364 | 364 | ||
365 | currTab = tab; | 365 | currTab = tab; |
366 | } | 366 | } |
367 | 367 | ||
368 | void OTabWidget::setUpLayout() | 368 | void OTabWidget::setUpLayout() |
369 | { | 369 | { |
370 | tabBar->layoutTabs(); | 370 | tabBar->layoutTabs(); |
371 | QSize t( tabBarStack->sizeHint() ); | 371 | QSize t( tabBarStack->sizeHint() ); |
372 | if ( tabBarStyle == IconTab ) | 372 | if ( tabBarStyle == IconTab ) |
373 | { | 373 | { |
374 | if ( t.width() > width() ) | 374 | if ( t.width() > width() ) |
375 | t.setWidth( width() ); | 375 | t.setWidth( width() ); |
376 | } | 376 | } |
377 | else | 377 | else |
378 | { | 378 | { |
379 | t.setWidth( width() ); | 379 | t.setWidth( width() ); |
380 | } | 380 | } |
381 | int lw = widgetStack->lineWidth(); | 381 | int lw = widgetStack->lineWidth(); |
382 | if ( tabBarPosition == Bottom ) | 382 | if ( tabBarPosition == Bottom ) |
383 | { | 383 | { |
384 | tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); | 384 | tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); |
385 | widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); | 385 | widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); |