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

put a found-paths cache in Theme

Browse Source
This commit is contained in:
Aaron Seigo 2011-07-22 17:34:46 +02:00
parent 95f09febca
commit c707923086
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
theme.cpp
View File

@ -148,7 +148,7 @@ public:
return cfg; return cfg;
} }
QString findInTheme(const QString &image, const QString &theme) const; QString findInTheme(const QString &image, const QString &theme, bool cache = true);
void compositingChanged(); void compositingChanged();
void discardCache(CacheTypes caches); void discardCache(CacheTypes caches);
void scheduledCacheUpdate(); void scheduledCacheUpdate();
@ -189,6 +189,7 @@ public:
QHash<QString, QString> idsToCache; QHash<QString, QString> idsToCache;
QHash<QString, QString> animationMapping; QHash<QString, QString> animationMapping;
QHash<styles, QString> cachedStyleSheets; QHash<styles, QString> cachedStyleSheets;
QHash<QString, QString> discoveries;
QTimer *saveTimer; QTimer *saveTimer;
#ifdef Q_WS_X11 #ifdef Q_WS_X11
@ -241,9 +242,12 @@ void ThemePrivate::onAppExitCleanup()
cacheTheme = false; cacheTheme = false;
} }
QString ThemePrivate::findInTheme(const QString &image, const QString &theme) const QString ThemePrivate::findInTheme(const QString &image, const QString &theme, bool cache)
{ {
//TODO: this should be using Package if (cache && discoveries.contains(image)) {
return discoveries[image];
}
QString search; QString search;
if (locolor) { if (locolor) {
@ -263,6 +267,10 @@ QString ThemePrivate::findInTheme(const QString &image, const QString &theme) co
search = KStandardDirs::locate("data", search); search = KStandardDirs::locate("data", search);
} }
if (cache && !search.isEmpty()) {
discoveries.insert(image, search);
}
return search; return search;
} }
@ -280,6 +288,8 @@ void ThemePrivate::compositingChanged()
void ThemePrivate::discardCache(CacheTypes caches) void ThemePrivate::discardCache(CacheTypes caches)
{ {
discoveries.clear();
if (caches & PixmapCache) { if (caches & PixmapCache) {
pixmapsToCache.clear(); pixmapsToCache.clear();
saveTimer->stop(); saveTimer->stop();
@ -794,8 +804,8 @@ bool Theme::currentThemeHasImage(const QString &name) const
return false; return false;
} }
return !(d->findInTheme(name % QLatin1Literal(".svgz"), d->themeName).isEmpty()) || return !(d->findInTheme(name % QLatin1Literal(".svgz"), d->themeName, false).isEmpty()) ||
!(d->findInTheme(name % QLatin1Literal(".svg"), d->themeName).isEmpty()); !(d->findInTheme(name % QLatin1Literal(".svg"), d->themeName, false).isEmpty());
} }
KSharedConfigPtr Theme::colorScheme() const KSharedConfigPtr Theme::colorScheme() const