More icon sizing updates

1 files changed, 14 insertions, 10 deletions

diff --git a/core/launcher/launchertab.cpp b/core/launcher/launchertab.cpp
index 710f259..72ebf59 100644
--- a/core/launcher/launchertab.cpp
+++ b/core/launcher/launchertab.cpp
@@ -94,16 +94,16 @@ void LauncherTabBar::layoutTabs()
 	if ( !t )
 	    continue;
 	int iw = fm.width( t->text() ) + hframe - overlap;
 	if ( t != current ) {
 	    available -= hiddenTabWidth + hframe - overlap;
 	    if ( t->iconSet() != 0 )
-		available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+		available -= t->iconSet()->pixmap().width();
 	}
 	if ( t->iconSet() != 0 )
-	    iw += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+	    iw += t->iconSet()->pixmap().width();
 	required += iw;
 	// As space gets tight, packed looks better than even. "10" must be at least 0.
 	if ( iw >= eventabwidth-10 )
 	    mode = Pack;
     }
     if ( mode == Pack && required > width()-1 )
@@ -113,14 +113,14 @@ void LauncherTabBar::layoutTabs()
 	if ( !t )
 	    continue;
 	if ( mode != HideBackText ) {
 	    int w = fm.width( t->text() );
 	    int ih = 0;
 	    if ( t->iconSet() != 0 ) {
-		w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-		ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+		w += t->iconSet()->pixmap().width();
+		ih = t->iconSet()->pixmap().height();
 	    }
 	    int h = QMAX( fm.height(), ih );
 	    h = QMAX( h, QApplication::globalStrut().height() );
 
 	    h += vframe;
 	    w += hframe;
@@ -131,14 +131,14 @@ void LauncherTabBar::layoutTabs()
 	    x += totr.width() - overlap;
 	    r = r.unite(totr);
 	} else if ( t != current ) {
 	    int w = hiddenTabWidth;
 	    int ih = 0;
 	    if ( t->iconSet() != 0 ) {
-		w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-		ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+		w += t->iconSet()->pixmap().width();
+		ih = t->iconSet()->pixmap().height();
 	    }
 	    int h = QMAX( fm.height(), ih );
 	    h = QMAX( h, QApplication::globalStrut().height() );
 
 	    h += vframe;
 	    w += hframe;
@@ -146,13 +146,13 @@ void LauncherTabBar::layoutTabs()
 	    t->setRect( QRect(x, 0, w, h) );
 	    x += t->rect().width() - overlap;
 	    r = r.unite( t->rect() );
 	} else {
 	    int ih = 0;
 	    if ( t->iconSet() != 0 ) {
-		ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+		ih = t->iconSet()->pixmap().height();
 	    }
 	    int h = QMAX( fm.height(), ih );
 	    h = QMAX( h, QApplication::globalStrut().height() );
 
 	    h += vframe;
 
@@ -217,14 +217,14 @@ void LauncherTabBar::paint( QPainter * p, QTab * t, bool selected ) const
 	that->setPalette( pal );
 	setPal = TRUE;
     }
     int iw = 0;
     int ih = 0;
     if ( t->iconSet() != 0 ) {
-	iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
-	ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+	iw = t->iconSet()->pixmap().width() + 2;
+	ih = t->iconSet()->pixmap().height();
     }
     int w = iw + p->fontMetrics().width( t->text() ) + 4;
     int h = QMAX(p->fontMetrics().height() + 4, ih );
     paintLabel( p, QRect( r.left() + (r.width()-w)/2 - 3,
 			    r.top() + (r.height()-h)/2, w, h ), t,
 #if QT_VERSION >= 0x030000
@@ -248,13 +248,17 @@ void LauncherTabBar::paintLabel( QPainter* p, const QRect&,
     //
     if ( t->iconSet() ) {
 	// the tab has an iconset, draw it in the right mode
 	QIconSet::Mode mode = (t->isEnabled() && isEnabled()) ? QIconSet::Normal : QIconSet::Disabled;
 	if ( mode == QIconSet::Normal && has_focus )
 	    mode = QIconSet::Active;
-	QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = t->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = t->iconSet()->pixmap();
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 	p->drawPixmap( r.left() + 6, r.center().y() - pixh / 2 + 1, pixmap );
 	r.setLeft( r.left() + pixw + 5 );
     }