Fix icon sizing for light and qpe styles

2 files changed, 12 insertions, 4 deletions

diff --git a/library/lightstyle.cpp b/library/lightstyle.cpp
index 3bd1623..c5073ca 100644
--- a/library/lightstyle.cpp
+++ b/library/lightstyle.cpp
@@ -875,410 +875,414 @@ void LightStyle::drawScrollBarControls( QPainter* p, const QScrollBar* scrollbar
     if (sliderStart > sliderMax) { // sanity check
         sliderStart = sliderMax;
     }
 
     QRect addR, subR, subR2, addPageR, subPageR, sliderR;
     int length =  ((scrollbar->orientation() == Horizontal) ?
 		   scrollbar->width()  : scrollbar->height());
     int extent =  ((scrollbar->orientation() == Horizontal) ?
 		   scrollbar->height() : scrollbar->width());
 
     
     int fudge = 3; //####disgusting hack
     
     if (scrollbar->orientation() == Horizontal) {
 	subR.setRect(0, defaultFrameWidth(),
 		     buttonDim + fudge, buttonDim);
 	subR2.setRect(length - (buttonDim * 2), defaultFrameWidth() ,
 		      buttonDim, buttonDim);
 	addR.setRect(length - buttonDim, defaultFrameWidth(),
 		     buttonDim, buttonDim);
     } else {
 	subR.setRect(defaultFrameWidth() + 1, 0,
 		     buttonDim, buttonDim + fudge);
 	subR2.setRect(defaultFrameWidth() + 1, length - (buttonDim * 2),
 		      buttonDim, buttonDim);
 	addR.setRect(defaultFrameWidth() + 1, length - buttonDim,
 		     buttonDim, buttonDim);
     }
 
     int sliderEnd = sliderStart + sliderLength;
     int sliderW = extent - defaultFrameWidth() - 1;
     if (scrollbar->orientation() == Horizontal) {
         subPageR.setRect( subR.right() + 1, defaultFrameWidth(),
                           sliderStart - subR.right() - 1 , sliderW );
         addPageR.setRect( sliderEnd, defaultFrameWidth(),
 			  subR2.left() - sliderEnd, sliderW );
         sliderR.setRect( sliderStart, defaultFrameWidth(), sliderLength, sliderW );
     } else {
         subPageR.setRect( defaultFrameWidth(), subR.bottom() + 1,
 			  sliderW, sliderStart - subR.bottom() - 1 );
         addPageR.setRect( defaultFrameWidth(), sliderEnd,
 			  sliderW, subR2.top() - sliderEnd );
         sliderR .setRect( defaultFrameWidth(), sliderStart,
 			  sliderW, sliderLength );
     }
 
     if ( controls == ( AddLine | SubLine | AddPage | SubPage |
                        Slider | First | Last ) ) {
 	if (scrollbar->orientation() == Horizontal)
 	    qDrawShadePanel(p, 0, 0, length, 2, g, TRUE, 1,
 			    &g.brush(QColorGroup::Background));
 	else
 	    qDrawShadePanel(p, 0, 0, 2, length, g, TRUE, 1,
 			    &g.brush(QColorGroup::Background));
     }
 
     if ( controls & AddLine )
         drawArrow( p, (scrollbar->orientation() == Vertical) ? DownArrow : RightArrow,
 		   FALSE, addR.x(), addR.y(),
                    addR.width(), addR.height(),
 		   (( activeControl == AddLine ) ?
 		    singleton->hoverPalette.active() : g),
 		   TRUE, &g.brush(QColorGroup::Background));
     if ( controls & SubLine ) {
         drawArrow( p, (scrollbar->orientation() == Vertical) ? UpArrow : LeftArrow,
 		   FALSE, subR.x(), subR.y(),
                    subR.width(), subR.height(),
                    (( activeControl == SubLine ) ?
 		    singleton->hoverPalette.active() : g),
 		   TRUE, &g.brush(QColorGroup::Background));
         drawArrow( p, (scrollbar->orientation() == Vertical) ? UpArrow : LeftArrow,
 		   FALSE, subR2.x(), subR2.y(),
                    subR2.width(), subR2.height(),
                    (( activeControl == SubLine ) ?
 		    singleton->hoverPalette.active() : g),
 		   TRUE, &g.brush(QColorGroup::Background));
     }
 
     if ( controls & SubPage )
         p->fillRect( subPageR,
 		     ((activeControl == SubPage) ?
 		      g.brush( QColorGroup::Dark ) :
 		      g.brush( QColorGroup::Mid )));
     if ( controls & AddPage )
         p->fillRect( addPageR,
 		     ((activeControl == AddPage) ?
     		      g.brush( QColorGroup::Dark ) :
 		      g.brush( QColorGroup::Mid )));
 
     if ( controls & Slider ) {
 
         QPoint bo = p->brushOrigin();
         p->setBrushOrigin(sliderR.topLeft());
         if ( sliderR.isValid() ) {
 	    p->fillRect( sliderR.x(), sliderR.y(), 2, 2,
 		      g.brush( QColorGroup::Mid ));
 	    p->fillRect( sliderR.x() + sliderR.width() - 2, 
 		    sliderR.y(), 2, 2,
 		      g.brush( QColorGroup::Mid ));
 	    p->fillRect( sliderR.x() + sliderR.width() - 2, 
 		    sliderR.y() + sliderR.height() - 2, 2, 2,
 		      g.brush( QColorGroup::Mid ));
 	    p->fillRect( sliderR.x(), 
 		    sliderR.y() + sliderR.height() - 2, 2, 2,
 		      g.brush( QColorGroup::Mid ));
 
 	    QColorGroup cg( g );
 	    cg.setBrush( QColorGroup::Background, g.brush( QColorGroup::Mid ) );
             drawBevelButton( p, sliderR.x(), sliderR.y(),
                              sliderR.width(), sliderR.height(),
 			     cg, FALSE, &g.brush( QColorGroup::Button ) );
         }
 
         p->setBrushOrigin(bo);
     }
 }
 
 
 void LightStyle::drawToolBarHandle(QPainter *p, const QRect &rect,
 				   Qt::Orientation orientation,
 				   bool, const QColorGroup &g, bool)
 {
     p->save();
     p->setPen(g.mid());
     p->setBrush(g.brush(QColorGroup::Mid));
 
     if (orientation == Qt::Horizontal) {
 	QRect l, r;
 	l.setRect(rect.x() + 1, rect.y() + 1, rect.width() - 5, rect.height() - 2);
 	r.setRect(l.right() + 1, l.y(), 3, l.height());
 
 	p->drawRect(l);
        	qDrawShadePanel(p, r, g, FALSE);
     } else {
 	QRect t, b;
 	t.setRect(rect.x() + 1, rect.y() + 1, rect.width() - 2, rect.height() - 5);
 	b.setRect(t.x(), t.bottom() + 1, t.width(), 3);
 
 	p->drawRect(t);
        	qDrawShadePanel(p, b, g, FALSE);
     }
 
     p->restore();
 }
 
 
 bool LightStyle::eventFilter(QObject *object, QEvent *event)
 {
     switch(event->type()) {
     case QEvent::Enter:
         {
             if (! object->isWidgetType() ||
 		! object->inherits("QPushButton"))
 		break;
 
 	    singleton->hoverWidget = (QWidget *) object;
 	    if (! singleton->hoverWidget->isEnabled()) {
 		singleton->hoverWidget = 0;
 		break;
 	    }
 
 	    QPalette pal = singleton->hoverWidget->palette();
 	    if (singleton->hoverWidget->ownPalette())
 		singleton->savePalette = new QPalette(pal);
 
 	    singleton->hoverWidget->setPalette(singleton->hoverPalette);
 
 	    break;
 	}
 
     case QEvent::Leave:
 	{
 	    if (object != singleton->hoverWidget)
 		break;
 
 	    if (singleton->savePalette) {
 		singleton->hoverWidget->setPalette(*(singleton->savePalette));
 		delete singleton->savePalette;
 		singleton->savePalette = 0;
 	    } else
 		singleton->hoverWidget->unsetPalette();
 
 	    singleton->hoverWidget = 0;
 
 	    break;
 	}
 
     default:
 	{
 	    ;
 	}
     }
 
     return QWindowsStyle::eventFilter(object, event);
 }
 
 
 static const int motifItemFrame		= 1;	// menu item frame width
 static const int motifSepHeight		= 2;	// separator item height
 static const int motifItemHMargin	= 1;	// menu item hor text margin
 static const int motifItemVMargin	= 2;	// menu item ver text margin
 static const int motifArrowHMargin	= 0;	// arrow horizontal margin
 static const int motifTabSpacing	= 12;	// space between text and tab
 static const int motifCheckMarkHMargin	= 1;	// horiz. margins of check mark
 static const int windowsRightBorder	= 8;    // right border on windows
 static const int windowsCheckMarkWidth  = 2;    // checkmarks width on windows
 
 /*! \reimp
 */
 int LightStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem* mi, const QFontMetrics& /*fm*/ )
 {
 #ifndef QT_NO_MENUDATA
     int w = 2*motifItemHMargin + 2*motifItemFrame; // a little bit of border can never harm
 
     if ( mi->isSeparator() )
 	return 10; // arbitrary
     else if ( mi->pixmap() )
 	w += mi->pixmap()->width();	// pixmap only
 
     if ( !mi->text().isNull() ) {
 	if ( mi->text().find('\t') >= 0 )	// string contains tab
 	    w += motifTabSpacing;
     }
 
     if ( maxpmw ) { // we have iconsets
 	w += maxpmw;
 	w += 6; // add a little extra border around the iconset
     }
 
     if ( checkable && maxpmw < windowsCheckMarkWidth ) {
 	w += windowsCheckMarkWidth - maxpmw; // space for the checkmarks
     }
 
     if ( maxpmw > 0 || checkable ) // we have a check-column ( iconsets or checkmarks)
 	w += motifCheckMarkHMargin; // add space to separate the columns
 
     w += windowsRightBorder; // windows has a strange wide border on the right side
 
     return w;
 #endif
 }
 
 /*! \reimp
 */
 int LightStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm )
 {
 #ifndef QT_NO_MENUDATA    
     int h = 0;
     if ( mi->isSeparator() )			// separator height
 	h = motifSepHeight;
     else if ( mi->pixmap() )		// pixmap height
 	h = mi->pixmap()->height() + 2*motifItemFrame;
     else					// text height
 	h = fm.height() + 2*motifItemVMargin + 2*motifItemFrame;
 
     if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
-	h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+	h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
     }
     if ( mi->custom() )
 	h = QMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
     return h;
 #endif
 }
 
 void LightStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi,
 				       const QPalette& pal,
 				       bool act, bool enabled, int x, int y, int w, int h)
 {
 #ifndef QT_NO_MENUDATA    
     const QColorGroup & g = pal.active();
     bool dis	  = !enabled;
     QColorGroup itemg = dis ? pal.disabled() : pal.active();
 
     if ( checkable )
 	maxpmw = QMAX( maxpmw, 8 ); // space for the checkmarks
 
     int checkcol	  =     maxpmw;
 
     if ( mi && mi->isSeparator() ) {			// draw separator
 	p->setPen( g.dark() );
 	p->drawLine( x, y, x+w, y );
 	p->setPen( g.light() );
 	p->drawLine( x, y+1, x+w, y+1 );
 	return;
     }
 
     QBrush fill = act? g.brush( QColorGroup::Highlight ) :
 			    g.brush( QColorGroup::Button );
     p->fillRect( x, y, w, h, fill);
 
     if ( !mi )
 	return;
 
     if ( mi->isChecked() ) {
 	if ( act && !dis ) {
 	    qDrawShadePanel( p, x, y, checkcol, h,
 			     g, TRUE, 1, &g.brush( QColorGroup::Button ) );
 	} else {
 	    qDrawShadePanel( p, x, y, checkcol, h,
 			     g, TRUE, 1, &g.brush( QColorGroup::Midlight ) );
 	}
     } else if ( !act ) {
 	p->fillRect(x, y, checkcol , h,
 		    g.brush( QColorGroup::Button ));
     }
 
     if ( mi->iconSet() ) {		// draw iconset
 	QIconSet::Mode mode = dis ? QIconSet::Disabled : QIconSet::Normal;
 	if (act && !dis )
 	    mode = QIconSet::Active;
-	QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = mi->iconSet()->pixmap();
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 	if ( act && !dis ) {
 	    if ( !mi->isChecked() )
 		qDrawShadePanel( p, x, y, checkcol, h, g, FALSE,  1, &g.brush( QColorGroup::Button ) );
 	}
 	QRect cr( x, y, checkcol, h );
 	QRect pmr( 0, 0, pixw, pixh );
 	pmr.moveCenter( cr.center() );
 	p->setPen( itemg.text() );
 	p->drawPixmap( pmr.topLeft(), pixmap );
 
 	QBrush fill = act? g.brush( QColorGroup::Highlight ) :
 			      g.brush( QColorGroup::Button );
 	p->fillRect( x+checkcol + 1, y, w - checkcol - 1, h, fill);
     } else  if ( checkable ) {	// just "checking"...
 	int mw = checkcol + motifItemFrame;
 	int mh = h - 2*motifItemFrame;
 	if ( mi->isChecked() ) {
 	    drawCheckMark( p, x + motifItemFrame + 2,
 			   y+motifItemFrame, mw, mh, itemg, act, dis );
 	}
     }
 
     p->setPen( act ? g.highlightedText() : g.buttonText() );
 
     QColor discol;
     if ( dis ) {
 	discol = itemg.text();
 	p->setPen( discol );
     }
 
     int xm = motifItemFrame + checkcol + motifItemHMargin;
 
     if ( mi->custom() ) {
 	int m = motifItemVMargin;
 	p->save();
 	if ( dis && !act ) {
 	    p->setPen( g.light() );
 	    mi->custom()->paint( p, itemg, act, enabled,
 				 x+xm+1, y+m+1, w-xm-tab+1, h-2*m );
 	    p->setPen( discol );
 	}
 	mi->custom()->paint( p, itemg, act, enabled,
 			     x+xm, y+m, w-xm-tab+1, h-2*m );
 	p->restore();
     }
     QString s = mi->text();
     if ( !s.isNull() ) {			// draw text
 	int t = s.find( '\t' );
 	int m = motifItemVMargin;
 	const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine;
 	if ( t >= 0 ) {				// draw tab text
 	    if ( dis && !act ) {
 		p->setPen( g.light() );
 		p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1,
 			     y+m+1, tab, h-2*m, text_flags, s.mid( t+1 ));
 		p->setPen( discol );
 	    }
 	    p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame,
 			 y+m, tab, h-2*m, text_flags, s.mid( t+1 ) );
 	}
 	if ( dis && !act ) {
 	    p->setPen( g.light() );
 	    p->drawText( x+xm+1, y+m+1, w-xm+1, h-2*m, text_flags, s, t );
 	    p->setPen( discol );
 	}
 	p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t );
     } else if ( mi->pixmap() ) {			// draw pixmap
 	QPixmap *pixmap = mi->pixmap();
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( OpaqueMode );
 	p->drawPixmap( x+xm, y+motifItemFrame, *pixmap );
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( TransparentMode );
     }
     if ( mi->popup() ) {			// draw sub menu arrow
 	int dim = (h-2*motifItemFrame) / 2;
 	if ( act ) {
 	    if ( !dis )
 		discol = white;
 	    QColorGroup g2( discol, g.highlight(),
 			    white, white,
 			    dis ? discol : white,
 			    discol, white );
 	    drawArrow( p, RightArrow, FALSE,
 			       x+w - motifArrowHMargin - motifItemFrame - dim,  y+h/2-dim/2,
 			       dim, dim, g2, TRUE );
 	} else {
 	    drawArrow( p, RightArrow,
 			       FALSE,
 			       x+w - motifArrowHMargin - motifItemFrame - dim,  y+h/2-dim/2,
 			       dim, dim, g, mi->isEnabled() );
 	}
     }
 #endif
 }
 
 #endif
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index 0566f6b..9503e02 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -782,410 +782,414 @@ void QPEStyle::drawScrollBarControls( QPainter* p, const QScrollBar* sb, int sli
 	QPoint bo = p->brushOrigin();
 	p->setBrushOrigin(sliderR.topLeft());
 	drawBevelButton( p, sliderR.x(), sliderR.y(),
 			 sliderR.width(), sliderR.height(), g,
 			 FALSE, &g.brush( QColorGroup::Button ) );
 	p->setBrushOrigin(bo);
 	drawRiffles( p, sliderR.x(), sliderR.y(),
 		     sliderR.width(), sliderR.height(), g, HORIZONTAL );
     }
 
     // ### perhaps this should not be able to accept focus if maxedOut?
     if ( sb->hasFocus() && (controls & Slider) )
 	p->drawWinFocusRect( sliderR.x()+2, sliderR.y()+2,
 			     sliderR.width()-5, sliderR.height()-5,
 			     sb->backgroundColor() );
 
 }
 
 void QPEStyle::drawRiffles( QPainter* p,  int x, int y, int w, int h,
                       const QColorGroup &g, bool horizontal )
 {
     if (!horizontal) {
 	if (h > 20) {
 	    y += (h-20)/2 ;
 	    h = 20;
 	}
 	if (h > 12) {
 	    int n = 3;
 	    int my = y+h/2-4;
 	    int i ;
 	    p->setPen(g.light());
 	    for (i=0; i<n; i++) {
 		p->drawLine(x+2, my+3*i, x+w-4, my+3*i);
 	    }
 	    p->setPen(g.dark());
 	    my++;
 	    for (i=0; i<n; i++) {
 		p->drawLine(x+2, my+3*i, x+w-4, my+3*i);
 	    }
 	}
     }
     else {
 	if (w > 20) {
 	    x += (w-20)/2 ;
 	    w = 20;
 	}
 	if (w > 12) {
 	    int n = 3;
 	    int mx = x+w/2-4;
 	    int i ;
 	    p->setPen(g.light());
 	    for (i=0; i<n; i++) {
 		p->drawLine(mx+3*i, y+2, mx + 3*i, y+h-4);
 	    }
 	    p->setPen(g.dark());
 	    mx++;
 	    for (i=0; i<n; i++) {
 		p->drawLine(mx+3*i, y+2, mx + 3*i, y+h-4);
 	    }
 	}
     }
 }
 
 int QPEStyle::sliderLength() const
 {
     return 12;
 }
 
 void QPEStyle::drawSlider( QPainter *p, int x, int y, int w, int h,
 	const QColorGroup &g, Orientation o, bool tickAbove, bool tickBelow )
 {
     int a = tickAbove ? 3 : 0;
     int b = tickBelow ? 3 : 0;
 
     if ( o == Horizontal ) {
 	drawBevelButton( p, x, y+a, w, h-a-b, g, FALSE, &g.brush( QColorGroup::Button ) );
 	int xp = x + w/2;
 	qDrawShadeLine( p, xp, y+a+2, xp, y+h-b-3, g );
     } else {
 	drawBevelButton( p, x+a, y, w-a-b, h, g, FALSE, &g.brush( QColorGroup::Button ) );
 	int yp = y + h/2;
 	qDrawShadeLine( p, x+a+2, yp, x+w-b-3, yp, g );
     }
 }
 
 void QPEStyle::drawSliderMask ( QPainter * p, int x, int y, int w, int h,
 	Orientation o, bool tickAbove, bool tickBelow )
 {
     int a = tickAbove ? 3 : 0;
     int b = tickBelow ? 3 : 0;
     if ( o == Horizontal )
 	p->fillRect( x, y+a, w, h-a-b, color1 );
     else
 	p->fillRect( x+a, y, w-a-b, h, color1 );
 }
 
 /*!\reimp
  */
 void QPEStyle::drawSliderGrooveMask( QPainter *p,
 					int x, int y, int w, int h,
 					const QColorGroup& , QCOORD c,
 					Orientation orient )
 {
     if ( orient == Horizontal )
 	p->fillRect( x, y + c - 2,  w, 4, color1 );
     else
 	p->fillRect( x + c - 2, y, 4, h, color1 );
 }
 
 void QPEStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected )
 {
     QRect r( t->rect() );
     if ( tb->shape()  == QTabBar::RoundedAbove ) {
 	p->setPen( tb->colorGroup().light() );
 	p->drawLine( r.left(), r.bottom(), r.right(), r.bottom() );
 	if ( r.left() == 0 )
 	    p->drawPoint( tb->rect().bottomLeft() );
 	else {
 	    p->setPen( tb->colorGroup().light() );
 	    p->drawLine( r.left(), r.bottom(), r.right(), r.bottom() );
 	}
 
 	if ( selected ) {
 	    p->setPen( tb->colorGroup().background() );
 	    p->drawLine( r.left()+2, r.top()+1, r.right()-2, r.top()+1 );
 	    p->fillRect( QRect( r.left()+1, r.top()+2, r.width()-2, r.height()-2),
 			 tb->colorGroup().brush( QColorGroup::Background ));
 	} else {
 	    r.setRect( r.left() + 2, r.top() + 2,
 		       r.width() - 4, r.height() - 2 );
 	    p->setPen( tb->colorGroup().button() );
 	    p->drawLine( r.left()+2, r.top()+1, r.right()-2, r.top()+1 );
 	    p->fillRect( QRect( r.left()+1, r.top()+2, r.width()-2, r.height()-3),
 			 tb->colorGroup().brush( QColorGroup::Button ));
 
 	    //do shading; will not work for pixmap brushes
 	    QColor bg = tb->colorGroup().button();
 	    //	    int h,s,v;
 	    //	    bg.hsv( &h, &s, &v );
 	    int n = r.height()/2;
 	    int dark = 100;
 	    for ( int i = 1; i < n; i++ ) {
 		dark = (dark * (100+(i*15)/n) )/100;
 		p->setPen( bg.dark( dark ) );
 		int y = r.bottom()-n+i;
 		int x1 = r.left()+1;
 		int x2 = r.right()-1;
 		p->drawLine( x1, y, x2, y );
 	    }
 	}
 
 	p->setPen( tb->colorGroup().light() );
 	p->drawLine( r.left(), r.bottom()-1, r.left(), r.top() + 2 );
 	p->drawPoint( r.left()+1, r.top() + 1 );
 	p->drawLine( r.left()+2, r.top(),
 		     r.right() - 2, r.top() );
 
 	p->setPen( tb->colorGroup().dark() );
 	p->drawPoint( r.right() - 1, r.top() + 1 );
 	p->drawLine( r.right(), r.top() + 2, r.right(), r.bottom() - 1);
     } else if ( tb->shape() == QTabBar::RoundedBelow ) {
 	if ( selected ) {
 	    p->setPen( tb->colorGroup().background() );
 	    p->drawLine( r.left()+2, r.bottom()-1, r.right()-2, r.bottom()-1 );
 	    p->fillRect( QRect( r.left()+1, r.top(), r.width()-2, r.height()-2),
 			 tb->palette().normal().brush( QColorGroup::Background ));
 	} else {
 	    p->setPen( tb->colorGroup().dark() );
 	    p->drawLine( r.left(), r.top(),
 			 r.right(), r.top() );
 	    r.setRect( r.left() + 2, r.top(),
 		       r.width() - 4, r.height() - 2 );
 	    p->setPen( tb->colorGroup().button() );
 	    p->drawLine( r.left()+2, r.bottom()-1, r.right()-2, r.bottom()-1 );
 	    p->fillRect( QRect( r.left()+1, r.top()+1, r.width()-2, r.height()-3),
 			 tb->palette().normal().brush( QColorGroup::Button ));
 	}
 
 	p->setPen( tb->colorGroup().dark() );
 	p->drawLine( r.right(), r.top(),
 		     r.right(), r.bottom() - 2 );
 	p->drawPoint( r.right() - 1, r.bottom() - 1 );
 	p->drawLine( r.right() - 2, r.bottom(),
 		     r.left() + 2, r.bottom() );
 
 	p->setPen( tb->colorGroup().light() );
 	p->drawLine( r.left(), r.top()+1,
 		     r.left(), r.bottom() - 2 );
 	p->drawPoint( r.left() + 1, r.bottom() - 1 );
 	if ( r.left() == 0 )
 	    p->drawPoint( tb->rect().topLeft() );
 
     } else {
 	QCommonStyle::drawTab( p, tb, t, selected );
     }
 }
 
 static const int motifItemFrame		= 0;	// menu item frame width
 static const int motifSepHeight		= 2;	// separator item height
 static const int motifItemHMargin	= 1;	// menu item hor text margin
 static const int motifItemVMargin	= 2;	// menu item ver text margin
 static const int motifArrowHMargin	= 0;	// arrow horizontal margin
 static const int motifTabSpacing	= 12;	// space between text and tab
 static const int motifCheckMarkHMargin	= 1;	// horiz. margins of check mark
 static const int windowsRightBorder	= 8;    // right border on windows
 static const int windowsCheckMarkWidth  = 2;    // checkmarks width on windows
 
 /*! \reimp
 */
 int QPEStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem* mi, const QFontMetrics& /*fm*/ )
 {
 #ifndef QT_NO_MENUDATA
     int w = 2*motifItemHMargin + 2*motifItemFrame; // a little bit of border can never harm
 
     if ( mi->isSeparator() )
 	return 10; // arbitrary
     else if ( mi->pixmap() )
 	w += mi->pixmap()->width();	// pixmap only
 
     if ( !mi->text().isNull() ) {
 	if ( mi->text().find('\t') >= 0 )	// string contains tab
 	    w += motifTabSpacing;
     }
 
     if ( maxpmw ) { // we have iconsets
 	w += maxpmw;
 	w += 6; // add a little extra border around the iconset
     }
 
     if ( checkable && maxpmw < windowsCheckMarkWidth ) {
 	w += windowsCheckMarkWidth - maxpmw; // space for the checkmarks
     }
 
     if ( maxpmw > 0 || checkable ) // we have a check-column ( iconsets or checkmarks)
 	w += motifCheckMarkHMargin; // add space to separate the columns
 
     w += windowsRightBorder; // windows has a strange wide border on the right side
 
     return w;
 #endif
 }
 
 /*! \reimp
 */
 int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm )
 {
 #ifndef QT_NO_MENUDATA
     int h = 0;
     if ( mi->isSeparator() )			// separator height
 	h = motifSepHeight;
     else if ( mi->pixmap() )		// pixmap height
 	h = mi->pixmap()->height() + 2*motifItemFrame;
     else					// text height
 	h = fm.height() + 2*motifItemVMargin + 2*motifItemFrame - 1;
 
     if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
-	h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+	h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
     }
     if ( mi->custom() )
 	h = QMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
     return h;
 #endif
 }
 
 void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi,
 				       const QPalette& pal,
 				       bool act, bool enabled, int x, int y, int w, int h)
 {
 #ifndef QT_NO_MENUDATA
     const QColorGroup & g = pal.active();
     bool dis	  = !enabled;
     QColorGroup itemg = dis ? pal.disabled() : pal.active();
 
     if ( checkable )
 	maxpmw = QMAX( maxpmw, 8 ); // space for the checkmarks
 
     int checkcol	  =     maxpmw;
 
     if ( mi && mi->isSeparator() ) {			// draw separator
 	p->setPen( g.dark() );
 	p->drawLine( x, y, x+w, y );
 	p->setPen( g.light() );
 	p->drawLine( x, y+1, x+w, y+1 );
 	return;
     }
 
     QBrush fill = act? g.brush( QColorGroup::Highlight ) :
 			    g.brush( QColorGroup::Button );
     p->fillRect( x, y, w, h, fill);
 
     if ( !mi )
 	return;
 
     if ( mi->isChecked() ) {
 	if ( act && !dis ) {
 	    qDrawShadePanel( p, x, y, checkcol, h,
 			     g, TRUE, 1, &g.brush( QColorGroup::Button ) );
 	} else {
 	    qDrawShadePanel( p, x, y, checkcol, h,
 			     g, TRUE, 1, &g.brush( QColorGroup::Midlight ) );
 	}
     } else if ( !act ) {
 	p->fillRect(x, y, checkcol , h,
 		    g.brush( QColorGroup::Button ));
     }
 
     if ( mi->iconSet() ) {		// draw iconset
 	QIconSet::Mode mode = dis ? QIconSet::Disabled : QIconSet::Normal;
 	if (act && !dis )
 	    mode = QIconSet::Active;
-	QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = mi->iconSet()->pixmap();
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 	if ( act && !dis ) {
 	    if ( !mi->isChecked() )
 		qDrawShadePanel( p, x, y, checkcol, h, g, FALSE,  1, &g.brush( QColorGroup::Button ) );
 	}
 	QRect cr( x, y, checkcol, h );
 	QRect pmr( 0, 0, pixw, pixh );
 	pmr.moveCenter( cr.center() );
 	p->setPen( itemg.text() );
 	p->drawPixmap( pmr.topLeft(), pixmap );
 
 	QBrush fill = act? g.brush( QColorGroup::Highlight ) :
 			      g.brush( QColorGroup::Button );
 	p->fillRect( x+checkcol + 1, y, w - checkcol - 1, h, fill);
     } else  if ( checkable ) {	// just "checking"...
 	int mw = checkcol + motifItemFrame;
 	int mh = h - 2*motifItemFrame;
 	if ( mi->isChecked() ) {
 	    drawCheckMark( p, x + motifItemFrame + 2,
 			   y+motifItemFrame, mw, mh, itemg, act, dis );
 	}
     }
 
     p->setPen( act ? g.highlightedText() : g.buttonText() );
 
     QColor discol;
     if ( dis ) {
 	discol = itemg.text();
 	p->setPen( discol );
     }
 
     int xm = motifItemFrame + checkcol + motifItemHMargin;
 
     if ( mi->custom() ) {
 	int m = motifItemVMargin;
 	p->save();
 	if ( dis && !act ) {
 	    p->setPen( g.light() );
 	    mi->custom()->paint( p, itemg, act, enabled,
 				 x+xm+1, y+m+1, w-xm-tab+1, h-2*m );
 	    p->setPen( discol );
 	}
 	mi->custom()->paint( p, itemg, act, enabled,
 			     x+xm, y+m, w-xm-tab+1, h-2*m );
 	p->restore();
     }
     QString s = mi->text();
     if ( !s.isNull() ) {			// draw text
 	int t = s.find( '\t' );
 	int m = motifItemVMargin;
 	const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine;
 	if ( t >= 0 ) {				// draw tab text
 	    if ( dis && !act ) {
 		p->setPen( g.light() );
 		p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1,
 			     y+m+1, tab, h-2*m, text_flags, s.mid( t+1 ));
 		p->setPen( discol );
 	    }
 	    p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame,
 			 y+m, tab, h-2*m, text_flags, s.mid( t+1 ) );
 	}
 	if ( dis && !act ) {
 	    p->setPen( g.light() );
 	    p->drawText( x+xm+1, y+m+1, w-xm+1, h-2*m, text_flags, s, t );
 	    p->setPen( discol );
 	}
 	p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t );
     } else if ( mi->pixmap() ) {			// draw pixmap
 	QPixmap *pixmap = mi->pixmap();
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( OpaqueMode );
 	p->drawPixmap( x+xm, y+motifItemFrame, *pixmap );
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( TransparentMode );
     }
     if ( mi->popup() ) {			// draw sub menu arrow
 	int dim = (h-2*motifItemFrame) / 2;
 	if ( act ) {
 	    if ( !dis )
 		discol = white;
 	    QColorGroup g2( discol, g.highlight(),
 			    white, white,
 			    dis ? discol : white,
 			    discol, white );
 	    drawArrow( p, RightArrow, FALSE,
 			       x+w - motifArrowHMargin - motifItemFrame - dim,  y+h/2-dim/2,
 			       dim, dim, g2, TRUE );
 	} else {
 	    drawArrow( p, RightArrow,
 			       FALSE,
 			       x+w - motifArrowHMargin - motifItemFrame - dim,  y+h/2-dim/2,
 			       dim, dim, g, mi->isEnabled() );
 	}
     }
 #endif
 }
 
 #endif