summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/otabwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp
index 80a4c9b..d23b1c9 100644
--- a/libopie2/opieui/otabwidget.cpp
+++ b/libopie2/opieui/otabwidget.cpp
@@ -305,97 +305,97 @@ void OTabWidget::setTabPosition( TabPosition p )
305 } 305 }
306 else 306 else
307 { 307 {
308 tabBar->setShape( QTabBar::RoundedBelow ); 308 tabBar->setShape( QTabBar::RoundedBelow );
309 } 309 }
310 setUpLayout(); 310 setUpLayout();
311} 311}
312 312
313void OTabWidget::slotTabBarSelected( int id ) 313void OTabWidget::slotTabBarSelected( int id )
314{ 314{
315 OTabInfo *newtab = tabs.first(); 315 OTabInfo *newtab = tabs.first();
316 while ( newtab && newtab->id() != id ) 316 while ( newtab && newtab->id() != id )
317 { 317 {
318 newtab = tabs.next(); 318 newtab = tabs.next();
319 } 319 }
320 if ( newtab && newtab->id() == id ) 320 if ( newtab && newtab->id() == id )
321 { 321 {
322 selectTab( newtab ); 322 selectTab( newtab );
323 } 323 }
324} 324}
325 325
326void OTabWidget::slotTabListSelected( int index ) 326void 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
335QPixmap OTabWidget::loadSmooth( const QString &name ) 335QPixmap 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
342void OTabWidget::selectTab( OTabInfo *tab ) 342void 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
368void OTabWidget::setUpLayout() 368void 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) );
386 } 386 }
387 else 387 else
388 { 388 {
389 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); 389 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() );
390 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX( 0, lw-2 ) ); 390 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX( 0, lw-2 ) );
391 } 391 }
392 392
393 if ( autoMask() ) 393 if ( autoMask() )
394 updateMask(); 394 updateMask();
395} 395}
396 396
397QSize OTabWidget::sizeHint() const 397QSize OTabWidget::sizeHint() const
398{ 398{
399 QSize s( widgetStack->sizeHint() ); 399 QSize s( widgetStack->sizeHint() );
400 QSize t( tabBarStack->sizeHint() ); 400 QSize t( tabBarStack->sizeHint() );
401 return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() ); 401 return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() );