From a881c51e7b20f086b6b8b546c116d38478f87840 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 21 Nov 2017 11:21:47 -0500 Subject: Quick adjustment for the finding of icons. Only use the fallback icon *after* the more expansive routine also fails. --- src-qt5/core/libLumina/LuminaXDG.cpp | 2 +- .../core/lumina-desktop/panel-plugins/applauncher/AppLaunchButton.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index b4954a26..1933ba93 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -853,7 +853,7 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ QIcon tmp; if(!iconName.contains("libreoffice")){ //libreoffice is stupid - their svg icons are un-renderable with Qt tmp = QIcon::fromTheme(iconName); - if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); } + //if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); } } if(!tmp.isNull()){ return tmp; } //found one in the theme diff --git a/src-qt5/core/lumina-desktop/panel-plugins/applauncher/AppLaunchButton.cpp b/src-qt5/core/lumina-desktop/panel-plugins/applauncher/AppLaunchButton.cpp index 1fd819b5..98770f18 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/applauncher/AppLaunchButton.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/applauncher/AppLaunchButton.cpp @@ -16,7 +16,7 @@ AppLaunchButtonPlugin::AppLaunchButtonPlugin(QWidget *parent, QString id, bool h button->setAutoRaise(true); button->setToolButtonStyle(Qt::ToolButtonIconOnly); appfile = id.section("---",0,0).section("::",1,1); - if(!QFile::exists(appfile) && appfile.endsWith(".desktop")){ + if(!QFile::exists(appfile) && appfile.endsWith(".desktop")){ //might be a relative path - try to find the file appfile = LUtils::AppToAbsolute(appfile.section("/",-1) ); } -- cgit