fix: onboard has same icon with fcitx

debian/changelog

@@ -1,3 +1,14 @@
+dde-shell (0.0.20) unstable; urgency=medium
+
+  * fix: brightness-popup's setting button no blur effect and txt color has error
+    Thanks to ZhaoYingZhen(Issue: https://github.com/linuxdeepin/developer-center/issues/8470)(Influence: brightness-popup's setting button)
+  * fix: tray plugin mouse right click cause dock crash
+    Thanks to ZhaoYingZhen(Issue: https://github.com/linuxdeepin/developer-center/issues/8506)(Influence: tray plugin menu display)
+  * fix: onboard has same icon with fcitx(issue: #8557)
+  * chore: bump version 0.0.20
+
+ -- tsic404 <liuheng@deepin.org>  Tue, 14 May 2024 10:20:00 +0800
+
 dde-shell (0.0.19) unstable; urgency=medium
 
   * feat: remove uos-ai plugin when uos ai uninstalled

panels/dock/tray/plugins/onboard/CMakeLists.txt

@@ -20,7 +20,7 @@ find_package(Dtk6Gui REQUIRED)
 find_package(Dtk6Widget REQUIRED)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
-add_library(${PLUGIN_NAME} SHARED ${SRCS} onboard.qrc)
+add_library(${PLUGIN_NAME} SHARED ${SRCS})
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 
 target_include_directories(${PLUGIN_NAME} PUBLIC ${Qt6DBus_INCLUDE_DIRS}

panels/dock/tray/plugins/onboard/onboarditem.cpp

@@ -31,15 +31,7 @@ OnboardItem::OnboardItem(QWidget *parent)
 
 QIcon OnboardItem::iconPixmap(QSize size, DGuiApplicationHelper::ColorType themeType) const
 {
-    QString iconName;
-    if (std::min(width(), height()) <= PLUGIN_BACKGROUND_MIN_SIZE
-        || themeType == DGuiApplicationHelper::LightType) {
-        iconName = ":/icons/icon/keyboard-symbolic.svg";
-    } else {
-        iconName = ":/icons/icon/keyboard-symbolic-dark.svg";
-    }
-
-    return QIcon(iconName);
+    return QIcon::fromTheme("onboard-symbolic");
 }
 
 void OnboardItem::paintEvent(QPaintEvent *e)
@@ -88,15 +80,7 @@ void OnboardItem::paintEvent(QPaintEvent *e)
         painter.fillPath(path, color);
     }
 
-    QString iconName;
-    if (std::min(width(), height()) <= PLUGIN_BACKGROUND_MIN_SIZE
-        || DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) {
-        iconName = ":/icons/icon/keyboard-symbolic.svg";
-    } else {
-        iconName = ":/icons/icon/keyboard-symbolic-dark.svg";
-    }
-
-    const QPixmap &pixmap = loadSvg(iconName, QSize(PLUGIN_ICON_MAX_SIZE, PLUGIN_ICON_MAX_SIZE));
+    const QPixmap &pixmap = QIcon::fromTheme("onboard-symbolic").pixmap(PLUGIN_ICON_MAX_SIZE, PLUGIN_ICON_MAX_SIZE);
     painter.setOpacity(1);
     const QRectF &rf = QRectF(rect());
     const QRectF &rfp = QRectF(pixmap.rect());