From 919a2b5a492a0bfbd8e08567b4485ac71e12e499 Mon Sep 17 00:00:00 2001
From: chenhongtao <chenhongtao@deepin.org>
Date: Wed, 22 Nov 2023 11:10:47 +0800
Subject: [PATCH] feat: use system battery icon first

Log:
---
 plugins/bluetooth/componments/bluetoothadapteritem.cpp | 5 ++++-
 plugins/power/powerstatuswidget.cpp                    | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/bluetooth/componments/bluetoothadapteritem.cpp b/plugins/bluetooth/componments/bluetoothadapteritem.cpp
index f1ec4daf1..88dfe1c29 100644
--- a/plugins/bluetooth/componments/bluetoothadapteritem.cpp
+++ b/plugins/bluetooth/componments/bluetoothadapteritem.cpp
@@ -16,6 +16,7 @@
 #include <DListView>
 #include <DSpinner>
 #include <DGuiApplicationHelper>
+#include <DIconTheme>
 
 #include <QBoxLayout>
 #include <QStandardItemModel>
@@ -115,7 +116,9 @@ QIcon BluetoothDeviceItem::getBatteryIcon(int percentage)
         percentageStr = "unknow";
     }
 
-    return QIcon::fromTheme(QString("battery-%1-symbolic").arg(percentageStr));
+    QString iconName = QString("battery-%1-symbolic").arg(percentageStr);
+    QIcon qrcIcon = DIconTheme::findQIcon(iconName, DIconTheme::DontFallbackToQIconFromTheme);
+    return DIconTheme::findQIcon(iconName, qrcIcon, DIconTheme::IgnoreBuiltinIcons);
 
 }
 
diff --git a/plugins/power/powerstatuswidget.cpp b/plugins/power/powerstatuswidget.cpp
index 32298b25e..6c48ddf31 100644
--- a/plugins/power/powerstatuswidget.cpp
+++ b/plugins/power/powerstatuswidget.cpp
@@ -95,9 +95,6 @@ QPixmap PowerStatusWidget::getBatteryIcon(int themeType)
                   .arg(plugged ? "plugged-symbolic" : "symbolic");
     }
 
-    if (themeType == DGuiApplicationHelper::ColorType::LightType)
-        iconStr.append(PLUGIN_MIN_ICON_NAME);
-
     const auto ratio = devicePixelRatioF();
     QSize pixmapSize = QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps) ? QSize(20, 20) : (QSize(20, 20) * ratio);
     QPixmap pix = QIcon::fromTheme(iconStr, QIcon::fromTheme(":/batteryicons/resources/batteryicons/" + iconStr + ".svg")).pixmap(pixmapSize);