summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-26 14:11:59 (UTC)
committer llornkcor <llornkcor>2002-10-26 14:11:59 (UTC)
commit2de7003cd700685e0c3696d51656f54d54c81f43 (patch) (side-by-side diff)
tree06f6c9b91dcea2c7dbed4347acba716da25ad487
parent86704160817aedc391ac16199b9fd1feec880a7f (diff)
downloadopie-2de7003cd700685e0c3696d51656f54d54c81f43.zip
opie-2de7003cd700685e0c3696d51656f54d54c81f43.tar.gz
opie-2de7003cd700685e0c3696d51656f54d54c81f43.tar.bz2
patch
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabwidget.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index bed7ef1..5fc3e8e 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -93,33 +93,33 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
{
tabBar->setShape( QTabBar::RoundedBelow );
}
//tabs.setAutoDelete( TRUE );
currentTab= 0x0;
}
OTabWidget::~OTabWidget()
{
}
void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
{
QPixmap iconset = loadSmooth( icon );
- QTab * tab = new QTab();
+ QTab *tab = new QTab();
if ( tabBarStyle == IconTab )
{
tab->label = QString::null;
}
else
{
tab->label = label;
}
if ( tabBarStyle == IconTab || tabBarStyle == IconList)
{
tab->iconset = new QIconSet( iconset );
}
int tabid = tabBar->addTab( tab );
if ( tabBarStyle == IconTab || tabBarStyle == IconList )
{
@@ -261,41 +261,46 @@ 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() );
- currentTab = tab;
+ tabBar->setCurrentTab( tab->id() );
+ setUpLayout();
+ tabBar->update();
+ }
+ else
+ {
+ tabBar->setCurrentTab( tab->id() );
}
- tabBar->setCurrentTab( tab->id() );
- setUpLayout();
- tabBar->update();
widgetStack->raiseWidget( tab->control() );
emit currentChanged( tab->control() );
+
+ currentTab = tab;
}
void OTabWidget::setUpLayout()
{
tabBar->layoutTabs();
QSize t( tabBarStack->sizeHint() );
if ( t.width() > width() )
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
{