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
@@ -1119,25 +1119,25 @@ int LightStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*
 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    
@@ -1173,25 +1173,29 @@ void LightStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
             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 );
 
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index 0566f6b..9503e02 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -1026,25 +1026,25 @@ int QPEStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem* mi
 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
@@ -1080,25 +1080,29 @@ void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int t
             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 );