src/hbcore/image/hbpixmapiconrenderer.cpp
changeset 21 4633027730f5
parent 5 627c4a0fd0e7
--- a/src/hbcore/image/hbpixmapiconrenderer.cpp	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconrenderer.cpp	Wed Aug 18 10:05:37 2010 +0300
@@ -100,20 +100,18 @@
 
 void HbPixmapIconRenderer::applyIconProperties()
 {
-    if ((iconColor.isValid()) && (iconMode != QIcon::Disabled)) {
+    if (iconMode != QIcon::Normal) {
+        QStyleOption opt(0);
+        opt.palette = QApplication::palette();
+        pixmapData = QApplication::style()->generatedIconPixmap(iconMode, pixmapData, &opt);
+    }
+    if (iconColor.isValid()) {
         if (!pixmapData.isNull()) {
             QPixmap mask = pixmapData.alphaChannel();
             pixmapData.fill(iconColor);
             pixmapData.setAlphaChannel(mask);
         }
     }
-
-    // Apply the mode
-    if (iconMode != QIcon::Normal) {
-        QStyleOption opt(0);
-        opt.palette = QApplication::palette();
-        pixmapData = QApplication::style()->generatedIconPixmap(iconMode, pixmapData, &opt);
-    }
     iconPropertiesApplied = true;
 }