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

be a lot more careful with how we react to theme changes. makes it innexpensive enough to call a bit more randomly (e.g. when compositing changes)

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=771873
This commit is contained in:
Aaron J. Seigo 2008-02-07 04:33:57 +00:00
parent 76132227a5
commit ce3e58d2b4
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
svg.cpp
View File

@ -60,11 +60,12 @@ class SharedSvgRenderer : public KSvgRenderer, public QSharedData
class Svg::Private class Svg::Private
{ {
public: public:
Private(const QString& imagePath) Private(const QString& imagePath, Svg *q)
: renderer(0), : renderer(0),
contentType(Svg::SingleImage) contentType(Svg::SingleImage),
themed(false)
{ {
setImagePath(imagePath); setImagePath(imagePath, q);
} }
~Private() ~Private()
@ -72,13 +73,18 @@ class Svg::Private
eraseRenderer(); eraseRenderer();
} }
void setImagePath(const QString &imagePath) void setImagePath(const QString &imagePath, Svg *q)
{ {
if (themed) {
disconnect(Plasma::Theme::self(), SIGNAL(changed()), q, SLOT(themeChanged()));
}
themed = !QDir::isAbsolutePath(imagePath); themed = !QDir::isAbsolutePath(imagePath);
path = themePath = QString(); path = themePath = QString();
if (themed) { if (themed) {
themePath = imagePath; themePath = imagePath;
connect(Plasma::Theme::self(), SIGNAL(changed()), q, SLOT(themeChanged()));
} else { } else {
path = imagePath; path = imagePath;
@ -220,11 +226,8 @@ QHash<QString, SharedSvgRenderer::Ptr> Svg::Private::renderers;
Svg::Svg(const QString& imagePath, QObject* parent) Svg::Svg(const QString& imagePath, QObject* parent)
: QObject(parent), : QObject(parent),
d(new Private(imagePath)) d(new Private(imagePath, this))
{ {
if (d->themed) {
connect(Plasma::Theme::self(), SIGNAL(changed()), this, SLOT(themeChanged()));
}
} }
Svg::~Svg() Svg::~Svg()
@ -326,7 +329,7 @@ Svg::ContentType Svg::contentType()
void Svg::setFile(const QString &svgFilePath) void Svg::setFile(const QString &svgFilePath)
{ {
d->setImagePath(svgFilePath); d->setImagePath(svgFilePath, this);
d->eraseRenderer(); d->eraseRenderer();
} }
@ -337,10 +340,20 @@ QString Svg::file() const
void Svg::themeChanged() void Svg::themeChanged()
{ {
if (!d->themed) {
return;
}
QString newPath = Theme::self()->image(d->themePath);
if (d->path == newPath) {
return;
}
d->removeFromCache(); d->removeFromCache();
d->path.clear(); d->path = newPath;
//delete d->renderer; we're a KSharedPtr //delete d->renderer; we're a KSharedPtr
d->renderer = 0; d->eraseRenderer();
emit repaintNeeded(); emit repaintNeeded();
} }