the svg is not getting set unless the meter type is explicitly set. sad.
svn path=/trunk/KDE/kdelibs/; revision=1095297
This commit is contained in:
parent
9e5a7b85c1
commit
4fe1de06bb
@ -400,6 +400,10 @@ void Meter::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Dat
|
|||||||
|
|
||||||
void Meter::setSvg(const QString &svg)
|
void Meter::setSvg(const QString &svg)
|
||||||
{
|
{
|
||||||
|
if (d->svg == svg) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
d->svg = svg;
|
d->svg = svg;
|
||||||
delete d->image;
|
delete d->image;
|
||||||
d->image = new Plasma::FrameSvg(this);
|
d->image = new Plasma::FrameSvg(this);
|
||||||
@ -446,6 +450,10 @@ void Meter::paint(QPainter *p,
|
|||||||
Q_UNUSED(option)
|
Q_UNUSED(option)
|
||||||
Q_UNUSED(widget)
|
Q_UNUSED(widget)
|
||||||
|
|
||||||
|
if (d->svg.isEmpty()) {
|
||||||
|
setMeterType(d->meterType);
|
||||||
|
}
|
||||||
|
|
||||||
if (!d->image) {
|
if (!d->image) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user