More icon sizing updates

1 files changed, 7 insertions, 4 deletions

diff --git a/noncore/styles/theme/othemestyle.cpp b/noncore/styles/theme/othemestyle.cpp
index 98e7253..106d206 100644
--- a/noncore/styles/theme/othemestyle.cpp
+++ b/noncore/styles/theme/othemestyle.cpp
@@ -1183,7 +1183,7 @@ void OThemeStyle::drawPushButtonLabel( QPushButton *btn, QPainter *p )
                                       ? QIconSet::Normal : QIconSet::Disabled;
                 if ( mode == QIconSet::Normal && btn->hasFocus() )
                         mode = QIconSet::Active;
-                QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Small, mode );
+                QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Automatic, mode );
                 int pixw = pixmap.width();
                 int pixh = pixmap.height();
 
@@ -1246,8 +1246,7 @@ int OThemeStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem *mi,
                 h = h2 > h ? h2 : h;
         }
         if ( mi->iconSet() ) {
-                h2 = mi->iconSet() ->
-                     pixmap( QIconSet::Small, QIconSet::Normal ).height() + offset;
+                h2 = mi->iconSet() ->pixmap().height() + offset;
                 h = h2 > h ? h2 : h;
         }
         h2 = fm.height() + offset;
@@ -1325,7 +1324,11 @@ void OThemeStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw,
                 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();
                 QRect cr( x, y, checkcol, h );