sync: from linuxdeepin/dtkgui

Synchronize source files from linuxdeepin/dtkgui. Source-pull-request: linuxdeepin/dtkgui#221
linuxdeepin · Jan 22, 2024 · 303e780 · 303e780
1 parent 740cea5
commit 303e780
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/util/dicontheme.cpp b/src/util/dicontheme.cpp
@@ -13,6 +13,8 @@
 #include <private/qguiapplication_p.h>
 #include <private/qiconloader_p.h>
 #endif
+#include "dplatformtheme.h"
+#include "dguiapplicationhelper.h"
 
 #include <DStandardPaths>
 
@@ -176,7 +178,8 @@ void DIconTheme::Cached::clear()
 
 QIcon DIconTheme::Cached::findQIcon(const QString &iconName, Options options, const QIcon &fallback)
 {
-    const QString cacheKey = iconName + QChar('/') + QString::number(static_cast<int>(options));
+    const QString themeName = DGuiApplicationHelper::instance()->applicationTheme()->iconThemeName();
+    const QString cacheKey = themeName + QLatin1Char('/') + iconName + QChar('/') + QString::number(static_cast<int>(options));
     if (data->cache.contains(cacheKey)) {
         auto cacheIcon = data->cache.object(cacheKey);
         if (cacheIcon->isNull())