From b853cfa40e47daf49909b5a567890fd1e0e76ff5 Mon Sep 17 00:00:00 2001
From: dengbo <79958313+dengbo11@users.noreply.github.com>
Date: Wed, 12 Apr 2023 09:57:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E6=A0=8F=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E9=9D=A2=E6=9D=BF=E7=9A=84=E7=94=B5=E6=B1=A0=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=20(#822)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

蓝牙插件和电源插件属于快捷面板区域插件, 不应该返回空的图标

Log: 修复任务栏快捷面板的电池插件图标显示异常的问题
Resolve: https://github.com/linuxdeepin/developer-center/issues/4004
Influence: 任务栏快捷面板显示
---
 plugins/bluetooth/bluetoothplugin.cpp | 3 ---
 plugins/power/powerplugin.cpp         | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/plugins/bluetooth/bluetoothplugin.cpp b/plugins/bluetooth/bluetoothplugin.cpp
index b2f790518..272c78f12 100644
--- a/plugins/bluetooth/bluetoothplugin.cpp
+++ b/plugins/bluetooth/bluetoothplugin.cpp
@@ -126,9 +126,6 @@ void BluetoothPlugin::refreshIcon(const QString &itemKey)
 
 QIcon BluetoothPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType)
 {
-    if (dockPart == DockPart::QuickPanel)
-        return QIcon();
-
     QString iconFile;
     if (themeType == DGuiApplicationHelper::ColorType::DarkType)
         iconFile = ":/bluetooth-active-symbolic.svg";
diff --git a/plugins/power/powerplugin.cpp b/plugins/power/powerplugin.cpp
index e9cb0434a..1e724c9ae 100644
--- a/plugins/power/powerplugin.cpp
+++ b/plugins/power/powerplugin.cpp
@@ -129,11 +129,6 @@ void PowerPlugin::setSortKey(const QString &itemKey, const int order)
 
 QIcon PowerPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType)
 {
-    // 快捷面板使用m_quickPanel
-    if (dockPart == DockPart::QuickPanel) {
-        return QIcon();
-    }
-
     const QPixmap pixmap = m_powerStatusWidget->getBatteryIcon(themeType);
     static QIcon batteryIcon;
     batteryIcon.detach();