1 files changed, 11 insertions, 4 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 51814e7..77cf198 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1300,13 +1300,17 @@ void LiquidStyle::drawPushButtonLabel(QPushButton *btn, QPainter *p)
     if ( btn->iconSet() && !btn->iconSet()->isNull() )
     {
         QIconSet::Mode mode = btn->isEnabled()
                               ? QIconSet::Normal : QIconSet::Disabled;
         if ( mode == QIconSet::Normal && btn->hasFocus() )
             mode = QIconSet::Active;
-        QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = btn->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = btn->iconSet()->pixmap();
         int pixw = pixmap.width();
         int pixh = pixmap.height();
 
         p->drawPixmap( x1+6, y1+h/2-pixh/2, pixmap );
         x1 += pixw + 8;
         w -= pixw + 8;
@@ -2152,13 +2156,17 @@ static const int windowsRightBorder     = 12;
         return;
     }
     if(mi->iconSet()) {
         QIconSet::Mode mode = dis? QIconSet::Disabled : QIconSet::Normal;
         if (!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);
         QRect pmr(0, 0, pixw, pixh);
         pmr.moveCenter( cr.center() );
         p->setPen(itemg.highlightedText());
@@ -2233,14 +2241,13 @@ int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
 
     int h = 0;
     if (mi->pixmap())
         h = mi->pixmap()->height();
 
     if (mi->iconSet())
-        h = QMAX(mi->iconSet()->
-                 pixmap(QIconSet::Small, QIconSet::Normal).height(), h);
+        h = QMAX(mi->iconSet()->pixmap().height(), h);
 
     h = QMAX(fm.height() + 4, h);
 
     // we want a minimum size of 18
     h = QMAX(h, 18);