author | llornkcor <llornkcor> | 2002-10-26 14:11:59 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-26 14:11:59 (UTC) |
commit | 2de7003cd700685e0c3696d51656f54d54c81f43 (patch) (unidiff) | |
tree | 06f6c9b91dcea2c7dbed4347acba716da25ad487 /libopie/otabwidget.cpp | |
parent | 86704160817aedc391ac16199b9fd1feec880a7f (diff) | |
download | opie-2de7003cd700685e0c3696d51656f54d54c81f43.zip opie-2de7003cd700685e0c3696d51656f54d54c81f43.tar.gz opie-2de7003cd700685e0c3696d51656f54d54c81f43.tar.bz2 |
patch
-rw-r--r-- | libopie/otabwidget.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index bed7ef1..5fc3e8e 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp | |||
@@ -253,57 +253,62 @@ void OTabWidget::slotTabListSelected( int index ) | |||
253 | if ( newtab ) | 253 | if ( newtab ) |
254 | { | 254 | { |
255 | selectTab( newtab ); | 255 | selectTab( newtab ); |
256 | } | 256 | } |
257 | } | 257 | } |
258 | 258 | ||
259 | QPixmap OTabWidget::loadSmooth( const QString &name ) | 259 | QPixmap OTabWidget::loadSmooth( const QString &name ) |
260 | { | 260 | { |
261 | QImage image = Resource::loadImage( name ); | 261 | QImage image = Resource::loadImage( name ); |
262 | QPixmap pixmap; | 262 | QPixmap pixmap; |
263 | pixmap.convertFromImage( image.smoothScale( 16, 16 ) ); | 263 | pixmap.convertFromImage( image.smoothScale( 16, 16 ) ); |
264 | return pixmap; | 264 | return pixmap; |
265 | } | 265 | } |
266 | 266 | ||
267 | void OTabWidget::selectTab( OTabInfo *tab ) | 267 | void OTabWidget::selectTab( OTabInfo *tab ) |
268 | { | 268 | { |
269 | if ( tabBarStyle == IconTab ) | 269 | if ( tabBarStyle == IconTab ) |
270 | { | 270 | { |
271 | if ( currentTab ) | 271 | if ( currentTab ) |
272 | { | 272 | { |
273 | tabBar->tab( currentTab->id() )->setText( "" ); | 273 | tabBar->tab( currentTab->id() )->setText( "" ); |
274 | setUpLayout(); | 274 | setUpLayout(); |
275 | } | 275 | } |
276 | tabBar->tab( tab->id() )->setText( tab->label() ); | 276 | tabBar->tab( tab->id() )->setText( tab->label() ); |
277 | currentTab = tab; | ||
278 | } | ||
279 | tabBar->setCurrentTab( tab->id() ); | 277 | tabBar->setCurrentTab( tab->id() ); |
280 | setUpLayout(); | 278 | setUpLayout(); |
281 | tabBar->update(); | 279 | tabBar->update(); |
280 | } | ||
281 | else | ||
282 | { | ||
283 | tabBar->setCurrentTab( tab->id() ); | ||
284 | } | ||
282 | 285 | ||
283 | widgetStack->raiseWidget( tab->control() ); | 286 | widgetStack->raiseWidget( tab->control() ); |
284 | 287 | ||
285 | emit currentChanged( tab->control() ); | 288 | emit currentChanged( tab->control() ); |
289 | |||
290 | currentTab = tab; | ||
286 | } | 291 | } |
287 | 292 | ||
288 | void OTabWidget::setUpLayout() | 293 | void OTabWidget::setUpLayout() |
289 | { | 294 | { |
290 | tabBar->layoutTabs(); | 295 | tabBar->layoutTabs(); |
291 | QSize t( tabBarStack->sizeHint() ); | 296 | QSize t( tabBarStack->sizeHint() ); |
292 | if ( t.width() > width() ) | 297 | if ( t.width() > width() ) |
293 | t.setWidth( width() ); | 298 | t.setWidth( width() ); |
294 | int lw = widgetStack->lineWidth(); | 299 | int lw = widgetStack->lineWidth(); |
295 | if ( tabBarPosition == Bottom ) | 300 | if ( tabBarPosition == Bottom ) |
296 | { | 301 | { |
297 | tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); | 302 | tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); |
298 | widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); | 303 | widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); |
299 | } | 304 | } |
300 | else | 305 | else |
301 | { | 306 | { |
302 | tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); | 307 | tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); |
303 | widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2)); | 308 | widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2)); |
304 | } | 309 | } |
305 | 310 | ||
306 | if ( autoMask() ) | 311 | if ( autoMask() ) |
307 | updateMask(); | 312 | updateMask(); |
308 | } | 313 | } |
309 | 314 | ||