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

avoid hitting disk repeatedly on svg find failure

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1029044
This commit is contained in:
Aaron J. Seigo 2009-09-28 20:41:37 +00:00
parent 4d051d8f86
commit 1a7416e23b
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
svg.cpp
View File

@ -73,7 +73,8 @@ class SvgPrivate
multipleImages(false),
themed(false),
applyColors(false),
cacheRendering(true)
cacheRendering(true),
themeFailed(false)
{
}
@ -130,6 +131,7 @@ class SvgPrivate
if (themed) {
themePath = imagePath;
themeFailed = false;
QObject::connect(actualTheme(), SIGNAL(themeChanged()), q, SLOT(themeChanged()));
} else if (QFile::exists(imagePath)) {
path = imagePath;
@ -251,7 +253,7 @@ class SvgPrivate
}
//kDebug() << kBacktrace();
if (themed && path.isEmpty()) {
if (themed && path.isEmpty() && !themeFailed) {
Applet *applet = qobject_cast<Applet*>(q->parent());
if (applet && applet->package()) {
path = applet->package()->filePath("images", themePath + ".svg");
@ -263,7 +265,8 @@ class SvgPrivate
if (path.isEmpty()) {
path = actualTheme()->imagePath(themePath);
if (path.isEmpty()) {
themeFailed = path.isEmpty();
if (themeFailed) {
kWarning() << "No image path found for" << themePath;
}
}
@ -279,10 +282,12 @@ class SvgPrivate
//kDebug() << "gots us an existing one!";
renderer = it.value();
} else {
if (path.isEmpty())
if (path.isEmpty()) {
renderer = new SharedSvgRenderer();
else
} else {
renderer = new SharedSvgRenderer(path);
}
s_renderers[path] = renderer;
}
@ -309,7 +314,16 @@ class SvgPrivate
QRectF elementRect(const QString &elementId)
{
if (themed && path.isEmpty()) {
if (themeFailed) {
return QRectF();
}
path = actualTheme()->imagePath(themePath);
themeFailed = !path.isEmpty();
if (themeFailed) {
return QRectF();
}
}
QString id = cacheId(elementId);
@ -410,6 +424,7 @@ class SvgPrivate
bool themed : 1;
bool applyColors : 1;
bool cacheRendering : 1;
bool themeFailed : 1;
};
QHash<QString, SharedSvgRenderer::Ptr> SvgPrivate::s_renderers;