fix icon theme search paths
using fallback search paths breaks qadwaitadecorations Signed-off-by: leia uwu <leia@tutamail.com> (cherry picked from commit 614574f15c507f884fc2ceff74db8c919674a0f1)
This commit is contained in:
parent
7865b8128e
commit
887db29f35
@ -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()) {
|
||||||
@ -348,4 +347,4 @@ void ThemeManager::refresh()
|
|||||||
|
|
||||||
initializeThemes();
|
initializeThemes();
|
||||||
initializeCatPacks();
|
initializeCatPacks();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user