From 1b03dc94d210c6cb54dcb564c51f3cd51d60aec3 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 27 Apr 2018 12:58:17 -0400 Subject: Make sure the libreoffice icons are no longer bypassed. Use the ones in the current theme. --- src-qt5/core/libLumina/LIconCache.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src-qt5') 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){ -- cgit