diff options
| author | Ken Moore <ken@ixsystems.com> | 2018-04-27 12:58:17 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2018-04-27 12:58:17 -0400 |
| commit | 1b03dc94d210c6cb54dcb564c51f3cd51d60aec3 (patch) | |
| tree | 7ae131d75ad2d6b58d92feecab3ca298c74839dd /src-qt5/core/libLumina | |
| parent | Turn off the libreoffice icon fix for non-material-design icon themes. (diff) | |
| download | lumina-1b03dc94d210c6cb54dcb564c51f3cd51d60aec3.tar.gz lumina-1b03dc94d210c6cb54dcb564c51f3cd51d60aec3.tar.bz2 lumina-1b03dc94d210c6cb54dcb564c51f3cd51d60aec3.zip | |
Make sure the libreoffice icons are no longer bypassed. Use the ones in the current theme.
Diffstat (limited to 'src-qt5/core/libLumina')
| -rw-r--r-- | src-qt5/core/libLumina/LIconCache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src-qt5/core/libLumina/LIconCache.cpp b/src-qt5/core/libLumina/LIconCache.cpp index 84428546..c3b0cc1b 100644 --- a/src-qt5/core/libLumina/LIconCache.cpp +++ b/src-qt5/core/libLumina/LIconCache.cpp @@ -53,6 +53,7 @@ bool LIconCache::isLoaded(QString icon){ QString LIconCache::findFile(QString icon){ if(icon.isEmpty()){ return ""; } + //Get the currently-set theme QString cTheme = QIcon::themeName(); if(cTheme.isEmpty()){ @@ -328,7 +329,7 @@ void LIconCache::ReadFile(LIconCache *obj, QString id, QString path){ } bool LIconCache::isThemeIcon(QString id){ - return (!id.contains("/") && !id.contains(".") && !id.contains("libreoffice") ); + return (!id.contains("/") && !id.contains(".") ); //&& !id.contains("libreoffice") ); } QIcon LIconCache::iconFromTheme(QString id){ |