Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 任务栏图标样式显示异常

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

Log: 修复任务栏图标样式显示异常的问题
Resolve: https://github.com/linuxdeepin/developer-center/issues/3921
Influence: 任务栏图标显示
This commit is contained in:
dengbo 2023-03-24 10:51:36 +08:00 committed by Tsic
parent 4a67d10770
commit e4276da661
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frame/item/appitem.cpp
View File

@ -24,6 +24,7 @@
#include <QGSettings> #include <QGSettings>
#include <DGuiApplicationHelper> #include <DGuiApplicationHelper>
#include <DPlatformTheme>
#include <DConfig> #include <DConfig>
DGUI_USE_NAMESPACE DGUI_USE_NAMESPACE
@ -48,6 +49,7 @@ AppItem::AppItem(DockInter *dockInter, const QGSettings *appSettings, const QGSe
, m_iconValid(true) , m_iconValid(true)
, m_lastclickTimes(0) , m_lastclickTimes(0)
, m_appIcon(QPixmap()) , m_appIcon(QPixmap())
, m_activeColor(DGuiApplicationHelper::instance()->systemTheme()->activeColor())
, m_updateIconGeometryTimer(new QTimer(this)) , m_updateIconGeometryTimer(new QTimer(this))
, m_retryObtainIconTimer(new QTimer(this)) , m_retryObtainIconTimer(new QTimer(this))
, m_refershIconTimer(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(m_activeAppSettings, &QGSettings::changed, this, &AppItem::onGSettingsChanged);
connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &AppItem::onThemeTypeChanged); connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &AppItem::onThemeTypeChanged);
connect(DGuiApplicationHelper::instance()->systemTheme(), &DPlatformTheme::activeColorChanged, this,
[this](const auto &color) { m_activeColor = color; });
/** 日历 1S定时判断是否刷新icon的处理 */ /** 日历 1S定时判断是否刷新icon的处理 */
connect(m_refershIconTimer, &QTimer::timeout, this, &AppItem::onRefreshIcon); 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_verticalIndicator = QPixmap(":/indicator/resources/indicator_ver.svg");
} }
m_activeHorizontalIndicator = QPixmap(":/indicator/resources/indicator_active.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 = QPixmap(":/indicator/resources/indicator_active_ver.svg");
m_activeVerticalIndicator.fill(m_activeColor);
switch (DockPosition) { switch (DockPosition) {
case Top: case Top:
pixmap = m_horizontalIndicator; pixmap = m_horizontalIndicator;

1
frame/item/appitem.h
View File

@ -127,6 +127,7 @@ private:
QPixmap m_verticalIndicator; QPixmap m_verticalIndicator;
QPixmap m_activeHorizontalIndicator; QPixmap m_activeHorizontalIndicator;
QPixmap m_activeVerticalIndicator; QPixmap m_activeVerticalIndicator;
QColor m_activeColor;
QTimer *m_updateIconGeometryTimer; QTimer *m_updateIconGeometryTimer;
QTimer *m_retryObtainIconTimer; QTimer *m_retryObtainIconTimer;