From e4276da661d3fd64d614a57575c095ce6e01cab9 Mon Sep 17 00:00:00 2001
From: dengbo <dengbo@uniontech.com>
Date: Fri, 24 Mar 2023 10:51:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E6=A0=8F=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

任务栏图标的高亮色跟随系统主题高亮色变化

Log: 修复任务栏图标样式显示异常的问题
Resolve: https://github.com/linuxdeepin/developer-center/issues/3921
Influence: 任务栏图标显示
---
 frame/item/appitem.cpp | 6 ++++++
 frame/item/appitem.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/frame/item/appitem.cpp b/frame/item/appitem.cpp
index afa39a1f2..1878e3a66 100644
--- a/frame/item/appitem.cpp
+++ b/frame/item/appitem.cpp
@@ -24,6 +24,7 @@
 #include <QGSettings>
 
 #include <DGuiApplicationHelper>
+#include <DPlatformTheme>
 #include <DConfig>
 
 DGUI_USE_NAMESPACE
@@ -48,6 +49,7 @@ AppItem::AppItem(DockInter *dockInter, const QGSettings *appSettings, const QGSe
     , m_iconValid(true)
     , m_lastclickTimes(0)
     , m_appIcon(QPixmap())
+    , m_activeColor(DGuiApplicationHelper::instance()->systemTheme()->activeColor())
     , m_updateIconGeometryTimer(new QTimer(this))
     , m_retryObtainIconTimer(new QTimer(this))
     , m_refershIconTimer(new QTimer(this))
@@ -96,6 +98,8 @@ AppItem::AppItem(DockInter *dockInter, const QGSettings *appSettings, const QGSe
         connect(m_activeAppSettings, &QGSettings::changed, this, &AppItem::onGSettingsChanged);
 
     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &AppItem::onThemeTypeChanged);
+    connect(DGuiApplicationHelper::instance()->systemTheme(), &DPlatformTheme::activeColorChanged, this,
+            [this](const auto &color) { m_activeColor = color; });
 
     /** 日历 1S定时判断是否刷新icon的处理 */
     connect(m_refershIconTimer, &QTimer::timeout, this, &AppItem::onRefreshIcon);
@@ -301,7 +305,9 @@ void AppItem::paintEvent(QPaintEvent *e)
                 m_verticalIndicator = QPixmap(":/indicator/resources/indicator_ver.svg");
             }
             m_activeHorizontalIndicator = QPixmap(":/indicator/resources/indicator_active.svg");
+            m_activeHorizontalIndicator.fill(m_activeColor);
             m_activeVerticalIndicator = QPixmap(":/indicator/resources/indicator_active_ver.svg");
+            m_activeVerticalIndicator.fill(m_activeColor);
             switch (DockPosition) {
             case Top:
                 pixmap = m_horizontalIndicator;
diff --git a/frame/item/appitem.h b/frame/item/appitem.h
index 1a310895e..e4ea95693 100644
--- a/frame/item/appitem.h
+++ b/frame/item/appitem.h
@@ -127,6 +127,7 @@ private:
     QPixmap m_verticalIndicator;
     QPixmap m_activeHorizontalIndicator;
     QPixmap m_activeVerticalIndicator;
+    QColor m_activeColor;
 
     QTimer *m_updateIconGeometryTimer;
     QTimer *m_retryObtainIconTimer;