fix: Modify icon color processing

Modify icon color processing

pms: TASK-361719

Author: caixr23

dock-network-plugin/quickpanelwidget.cpp

@@ -56,7 +56,6 @@ class QuickButton : public DFloatingButton
         }
         option->palette.setBrush(QPalette::Button, bgColor);
         option->palette.setBrush(QPalette::ButtonText, textColor);
-        option->palette.setBrush(QPalette::WindowText, Qt::red);
         option->state.setFlag(QStyle::State_MouseOver, false);
         option->state.setFlag(QStyle::State_Sunken, false);
         option->state.setFlag(QStyle::State_Raised, true);
@@ -79,19 +78,12 @@ QuickPanelWidget::~QuickPanelWidget() { }
 void QuickPanelWidget::setIcon(const QIcon &icon)
 {
 
-    // DDciIcon dciIcon = DDciIcon::fromTheme(icon.name());
-    // if(dciIcon.isNull()){
+    DDciIcon dciIcon = DDciIcon::fromTheme(icon.name());
+    if (dciIcon.isNull()) {
         m_iconWidget->setIcon(icon);
-    // }else{
-    //     m_iconWidget->setIcon(dciIcon);
-    // }
-    // m_iconWidget->setIcon(icon);
-    // // "network-wireless-6-offline-secure-symbolic"
-    // DDciIcon::fromTheme("network-wireless-6-offline-secure-symbolic");
-    // m_iconWidget->setIcon(DDciIcon::fromTheme("network-wireless-6-offline-secure-symbolic"));
-    // DDciIcon::fromTheme("network-wireless-6-offline-secure-symbolic");
-    // m_iconWidget->setIcon(QIcon::fromTheme("network-wireless-6-offline-secure-symbolic"));
-    // network-wireless-6-signal-full-secure-symbolic_16px.svg
+    } else {
+        m_iconWidget->setIcon(dciIcon);
+    }
 }
 
 void QuickPanelWidget::setText(const QString &text)

net-view/window/private/neticonbutton.cpp

@@ -17,6 +17,7 @@ NetIconButton::NetIconButton(QWidget *parent)
     , m_clickable(false)
     , m_rotatable(false)
     , m_hover(false)
+    , m_textType(true)
 {
     setAccessibleName("NetIconButton");
     setFixedSize(24, 24);
@@ -50,6 +51,12 @@ void NetIconButton::setRotatable(bool rotatable)
     }
 }
 
+void NetIconButton::setTextType(bool textType)
+{
+    m_textType = textType;
+    update();
+}
+
 void NetIconButton::startRotate()
 {
     if (!m_refreshTimer) {
@@ -93,18 +100,27 @@ void NetIconButton::paintEvent(QPaintEvent *e)
         return;
     QPainter painter(this);
     painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
-
+    QRect r = rect();
     if (m_rotateAngle != 0) {
-        painter.translate(this->width() / 2, this->height() / 2);
+        painter.translate(r.width() / 2, r.height() / 2);
         painter.rotate(m_rotateAngle);
-        painter.translate(-(this->width() / 2), -(this->height() / 2));
+        painter.translate(-(r.width() / 2), -(r.height() / 2));
     }
-
+    const qreal scale = devicePixelRatio();
+    QSize pixmapSize = r.size() * scale;
+    QPixmap pm;
     if (m_hover && !m_hoverIcon.isNull()) {
-        m_hoverIcon.paint(&painter, rect());
+        pm = m_hoverIcon.pixmap(pixmapSize);
     } else {
-        m_icon.paint(&painter, rect());
+        pm = m_icon.pixmap(pixmapSize);
+    }
+    if (m_textType) {
+        QPainter pa(&pm);
+        pa.setCompositionMode(QPainter::CompositionMode_SourceIn);
+        pa.fillRect(r, painter.pen().brush());
     }
+    pm.setDevicePixelRatio(scale);
+    painter.drawPixmap(r, pm);
 }
 
 void NetIconButton::mousePressEvent(QMouseEvent *event)

net-view/window/private/neticonbutton.h

@@ -22,6 +22,7 @@ public Q_SLOTS:
 
     void setClickable(bool clickable);
     void setRotatable(bool rotatable);
+    void setTextType(bool textType);
 
 signals:
     void clicked();
@@ -44,6 +45,7 @@ public Q_SLOTS:
     bool m_clickable;
     bool m_rotatable;
     bool m_hover;
+    bool m_textType;
 };
 
 } // namespace network