aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2018-04-27 12:46:53 -0400
committerKen Moore <ken@ixsystems.com>2018-04-27 12:46:53 -0400
commita7ac76c0645dda9f4a8c661cc1c956971e2e68b4 (patch)
treef91d44cacc733bfcf038dd01601afd25c8df080c /src-qt5/core
parentCleanup the icon loading routines for battery status. (diff)
downloadlumina-a7ac76c0645dda9f4a8c661cc1c956971e2e68b4.tar.gz
lumina-a7ac76c0645dda9f4a8c661cc1c956971e2e68b4.tar.bz2
lumina-a7ac76c0645dda9f4a8c661cc1c956971e2e68b4.zip
Turn off the libreoffice icon fix for non-material-design icon themes.
Diffstat (limited to 'src-qt5/core')
-rw-r--r--src-qt5/core/libLumina/LuminaXDG.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index 95585f1e..a17f1e7c 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -851,7 +851,7 @@ void LXDG::setEnvironmentVars(){
QIcon LXDG::findIcon(QString iconName, QString fallback){
//With the addition of the Lumina theme engine (8/3/17), switch back to using the Qt icon from theme method for apps
QIcon tmp;
- if(!iconName.contains("libreoffice")){ //libreoffice is stupid - their svg icons are un-renderable with Qt
+ if(!iconName.contains("libreoffice") || !QIcon::themeName().startsWith("material-design") ){ //libreoffice is stupid - their svg icons are un-renderable with Qt
tmp = QIcon::fromTheme(iconName);
/*if(iconName.contains("start-here")){
qDebug() << "[ICON]" << iconName << "found:" << !tmp.isNull() << tmp.name();
bgstack15