alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid some unnecessary theme content lookups

Browse Source 
Summary:
imagePath can be an absolute path into an iconTheme
-> Do not try to find it in the Plasma theme

imagePath can be empty
-> Do not try to look it up at all

Reviewers: #plasma, mart

Reviewed By: #plasma, mart

Subscribers: #frameworks

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D7250
This commit is contained in:
Fabian Vogt 2017-08-11 14:23:09 +02:00
parent 24193527bf
commit 883a0488f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plasma/svg.cpp
View File

@ -188,11 +188,11 @@ bool SvgPrivate::setImagePath(const QString &imagePath)
actualPath = actualPath.mid(7);
}
bool isThemed = !QDir::isAbsolutePath(actualPath);
bool isThemed = !actualPath.isEmpty() && !QDir::isAbsolutePath(actualPath);
bool inIconTheme = false;
//an absolute path.. let's try if this actually an *icon* theme
if (!isThemed) {
if (!isThemed && !actualPath.isEmpty()) {
const auto *iconTheme = KIconLoader::global()->theme();
isThemed = inIconTheme = iconTheme && actualPath.startsWith(iconTheme->dir());
}
@ -222,7 +222,7 @@ bool SvgPrivate::setImagePath(const QString &imagePath)
localRectCache.clear();
elementsWithSizeHints.clear();
bool oldFromCurrentTheme = fromCurrentTheme;
fromCurrentTheme = actualTheme()->currentThemeHasImage(imagePath);
fromCurrentTheme = !inIconTheme && isThemed && actualTheme()->currentThemeHasImage(imagePath);
if (fromCurrentTheme != oldFromCurrentTheme) {
emit q->fromCurrentThemeChanged(fromCurrentTheme);