From 3eb95284a06faa47dcf84e7016682f029c310dff Mon Sep 17 00:00:00 2001 From: ck Date: Wed, 28 Feb 2024 13:07:52 +0800 Subject: [PATCH] fix: dcc-dock-plugin icon tweak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 控制中心中dock的插件统一混合颜色 暗色主题时填充白色，浅色主题填充黑色 Issue: https://github.com/linuxdeepin/developer-center/issues/6454 --- frame/dbus/dbusdockadaptors.cpp | 9 ++++++++- plugins/multitasking/multitaskingplugin.cpp | 6 ------ plugins/onboard/onboardplugin.cpp | 12 ++---------- plugins/show-desktop/showdesktopplugin.cpp | 6 ------ plugins/shutdown/shutdownplugin.cpp | 7 ------- plugins/trash/trashplugin.cpp | 8 +------- 6 files changed, 11 insertions(+), 37 deletions(-) diff --git a/frame/dbus/dbusdockadaptors.cpp b/frame/dbus/dbusdockadaptors.cpp index dc50ba105..2f1be7f8a 100644 --- a/frame/dbus/dbusdockadaptors.cpp +++ b/frame/dbus/dbusdockadaptors.cpp @@ -335,7 +335,14 @@ QIcon DBusDockAdaptors::getSettingIcon(PluginsItemInterface *plugin, QSize &pixm QIcon icon = plugin->icon(DockPart::DCCSetting, colorType); if (!icon.isNull()) { pixmapSize = iconSize(icon); - return icon; + + QColor c = colorType == DGuiApplicationHelper::LightType ? Qt::black :Qt::white; + QPixmap pixmap = icon.pixmap(pixmapSize); + QPainter pa(&pixmap); + pa.setCompositionMode(QPainter::CompositionMode_SourceIn); + pa.fillRect(pixmap.rect(), c); + + return pixmap; } // 如果插件中没有设置图标，则根据插件的类型，获取其他的图标 diff --git a/plugins/multitasking/multitaskingplugin.cpp b/plugins/multitasking/multitaskingplugin.cpp index 3baf4906a..8c626e093 100644 --- a/plugins/multitasking/multitaskingplugin.cpp +++ b/plugins/multitasking/multitaskingplugin.cpp @@ -145,12 +145,6 @@ QIcon MultitaskingPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper:: if (dockPart == DockPart::DCCSetting) { auto icon = QIcon::fromTheme("dcc-multitasking-view", QIcon(":/icons/dcc-multitasking-view.svg")); QPixmap pixmap = icon.pixmap(QSize(18, 18)); - if (themeType == DGuiApplicationHelper::ColorType::LightType) - return pixmap; - - QPainter pa(&pixmap); - pa.setCompositionMode(QPainter::CompositionMode_SourceIn); - pa.fillRect(pixmap.rect(), Qt::white); return pixmap; } diff --git a/plugins/onboard/onboardplugin.cpp b/plugins/onboard/onboardplugin.cpp index e94e48264..e6511b7aa 100644 --- a/plugins/onboard/onboardplugin.cpp +++ b/plugins/onboard/onboardplugin.cpp @@ -146,16 +146,8 @@ void OnboardPlugin::pluginSettingsChanged() QIcon OnboardPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType) { - if (dockPart == DockPart::DCCSetting) { - if (themeType == DGuiApplicationHelper::ColorType::LightType) - return QIcon(":/icons/icon/dcc_keyboard.svg"); - - QPixmap pixmap(":/icons/icon/dcc_keyboard.svg"); - QPainter pa(&pixmap); - pa.setCompositionMode(QPainter::CompositionMode_SourceIn); - pa.fillRect(pixmap.rect(), Qt::white); - return pixmap; - } + if (dockPart == DockPart::DCCSetting) + return QIcon(":/icons/icon/dcc_keyboard.svg"); if (dockPart == DockPart::QuickPanel) return m_onboardItem->iconPixmap(QSize(24, 24), themeType); diff --git a/plugins/show-desktop/showdesktopplugin.cpp b/plugins/show-desktop/showdesktopplugin.cpp index 0920167fd..0d86c6cca 100644 --- a/plugins/show-desktop/showdesktopplugin.cpp +++ b/plugins/show-desktop/showdesktopplugin.cpp @@ -127,12 +127,6 @@ QIcon ShowDesktopPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::C auto loadsvg = []{ return ImageUtil::loadSvg(":/icons/dcc-show-desktop.svg", QSize(18, 18));}; auto icon = QIcon::fromTheme("dcc-show-desktop", loadsvg()); QPixmap pixmap = icon.pixmap(QSize(18, 18)); - if (themeType == DGuiApplicationHelper::ColorType::LightType) - return pixmap; - - QPainter pa(&pixmap); - pa.setCompositionMode(QPainter::CompositionMode_SourceIn); - pa.fillRect(pixmap.rect(), Qt::white); return pixmap; } diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index 5830b5943..f612a30f0 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -277,13 +277,6 @@ QIcon ShutdownPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::Colo if (dockPart == DockPart::DCCSetting) { QString iconFile(":/icons/resources/icons/dcc_shutdown.svg"); auto pixmap = ImageUtil::loadSvg(iconFile, QSize(18, 18)); - if (themeType == DGuiApplicationHelper::ColorType::LightType) - return pixmap; - - QPainter pa(&pixmap); - pa.setCompositionMode(QPainter::CompositionMode_SourceIn); - pa.fillRect(pixmap.rect(), Qt::white); - return pixmap; } diff --git a/plugins/trash/trashplugin.cpp b/plugins/trash/trashplugin.cpp index 0489fc20f..c03c638e4 100644 --- a/plugins/trash/trashplugin.cpp +++ b/plugins/trash/trashplugin.cpp @@ -172,16 +172,10 @@ void TrashPlugin::pluginSettingsChanged() refreshPluginItemsVisible(); } -QIcon TrashPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType) +QIcon TrashPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType ) { if (dockPart == DockPart::DCCSetting) { auto pixmap = ImageUtil::loadSvg(":/icons/dcc_trash.svg", QSize(18, 18)); - if (themeType == DGuiApplicationHelper::ColorType::LightType) - return pixmap; - - QPainter pa(&pixmap); - pa.setCompositionMode(QPainter::CompositionMode_SourceIn); - pa.fillRect(pixmap.rect(), Qt::white); return pixmap; }