ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #3183 from PrismLauncher/backport-3170-to-release-9.x

Browse Source 
[Backport release-9.x] [Linux] Don't use fallback icon search paths
This commit is contained in:
Alexandru Ionut Tripon 2024-12-09 09:15:53 +02:00 committed by GitHub
commit 577999bd35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/ui/themes/ThemeManager.cpp
View File

@ -37,7 +37,8 @@
ThemeManager::ThemeManager() ThemeManager::ThemeManager()
{ {
QIcon::setFallbackThemeName(QIcon::themeName()); QIcon::setFallbackThemeName(QIcon::themeName());
QIcon::setFallbackSearchPaths(QIcon::themeSearchPaths()); QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << m_iconThemeFolder.path());
themeDebugLog() << "Determining System Widget Theme..."; themeDebugLog() << "Determining System Widget Theme...";
const auto& style = QApplication::style(); const auto& style = QApplication::style();
m_defaultStyle = style->objectName(); m_defaultStyle = style->objectName();
@ -95,8 +96,6 @@ void ThemeManager::initializeIcons()
// set icon theme search path! // set icon theme search path!
themeDebugLog() << "<> Initializing Icon Themes"; themeDebugLog() << "<> Initializing Icon Themes";
QIcon::setThemeSearchPaths({ m_iconThemeFolder.path(), ":/icons" });
for (const QString& id : builtinIcons) { for (const QString& id : builtinIcons) {
IconTheme theme(id, QString(":/icons/%1").arg(id)); IconTheme theme(id, QString(":/icons/%1").arg(id));
if (!theme.load()) { if (!theme.load()) {