Merge pull request #192 from notplus/bugfix/toolbar-button

FIX: editor tool button icon not refresh

Author: altairwei

src/gui/documentviewer/WizEditorToolBar.cpp

@@ -631,7 +631,7 @@ class CWizToolButton : public WizDblclickableToolButton
         p.setClipRect(opt.rect);
 
         QIcon::Mode mode = opt.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled;
-        if (mode == QIcon::Normal && (opt.state & QStyle::State_Sunken))
+        if (mode == QIcon::Normal && (opt.state & QStyle::State_On))
             mode = QIcon::Active;
         QIcon::State state = QIcon::Off;
         if (opt.state & QStyle::State_On)
@@ -652,7 +652,7 @@ class CWizToolButton : public WizDblclickableToolButton
             QRect rcIcon((opt.rect.width() - iconSize.width()) / 2, (opt.rect.height() - iconSize.height()) / 2, iconSize.width(), iconSize.height());
             if (opt.arrowType == Qt::RightArrow)
                 rcIcon.setX((opt.rect.width() - iconSize.width()) / 2 - TOOLBUTTON_MARGIN_WIDTH);
-            opt.icon.paint(&p, rcIcon, Qt::AlignCenter, mode);
+            opt.icon.paint(&p, rcIcon, Qt::AlignCenter, mode, state);
         } else if (textWidth > 0) {
             p.drawText(opt.rect, Qt::AlignCenter, text);
         }

src/share/WizMisc.cpp

@@ -1791,33 +1791,18 @@ QIcon WizLoadSkinIconFiles(const QString& strSkinName, const QString& strIconNam
         return QIcon();
     }
 
-    bool bSvgExt = Utils::WizMisc::extractFileExt(strIconNormal) == ".svg";
-
     QIcon icon(strIconNormal);
-
-    if (bSvgExt)
-        icon.addPixmap(svg2Pixmap(strIconNormal, iconSize), QIcon::Normal, QIcon::Off);
-    else
-        icon.addFile(strIconNormal, iconSize, QIcon::Normal, QIcon::Off);
+    icon.addFile(strIconNormal, iconSize, QIcon::Normal, QIcon::Off);
 
     // used for check state； "_on" suffix
     if (!strIconActive1.isEmpty() && QFile::exists(strIconActive1)) {
-        if (bSvgExt)
-            icon.addPixmap(svg2Pixmap(strIconActive1, iconSize), QIcon::Active, QIcon::On);
-        else
-            icon.addFile(strIconActive1, iconSize, QIcon::Active, QIcon::On);
+        icon.addFile(strIconActive1, iconSize, QIcon::Active, QIcon::On);
     }
 
     // used for sunken state; "_selected" suffix
     if (!strIconActive2.isEmpty() && QFile::exists(strIconActive2)) {
-        if (bSvgExt) {
-            icon.addPixmap(svg2Pixmap(strIconActive2, iconSize), QIcon::Active, QIcon::Off);
-            icon.addPixmap(svg2Pixmap(strIconActive2, iconSize), QIcon::Selected, QIcon::Off);
-        } else {
-            icon.addFile(strIconActive2, iconSize, QIcon::Active, QIcon::Off);
-            icon.addFile(strIconActive2, iconSize, QIcon::Selected, QIcon::Off);
-        }
-            
+        icon.addFile(strIconActive2, iconSize, QIcon::Active, QIcon::Off);
+        icon.addFile(strIconActive2, iconSize, QIcon::Selected, QIcon::Off);
     }
 
     return icon;