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

animate transitions when an svg is used as well.

Browse Source
This commit is contained in:
Aaron Seigo 2011-12-02 10:39:18 +01:00
parent c546b3d47d
commit 34376c31b1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/iconwidget.cpp
View File

@ -650,15 +650,25 @@ void IconWidget::setSvg(const QString &svgFilePath, const QString &elementId)
if (!d->iconSvg) { if (!d->iconSvg) {
d->iconSvg = new Plasma::Svg(this); d->iconSvg = new Plasma::Svg(this);
connect(d->iconSvg, SIGNAL(repaintNeeded()), this, SLOT(svgChanged())); connect(d->iconSvg, SIGNAL(repaintNeeded()), this, SLOT(svgChanged()));
d->oldIcon = d->icon;
} else {
d->oldIcon = d->iconSvg->pixmap(d->iconSvgElement);
} }
d->iconSvg->setImagePath(svgFilePath); d->iconSvg->setImagePath(svgFilePath);
d->iconSvg->setContainsMultipleImages(!elementId.isNull()); d->iconSvg->setContainsMultipleImages(!elementId.isNull());
d->iconSvgElement = elementId; d->iconSvgElement = elementId;
d->iconSvgElementChanged = true; d->iconSvgElementChanged = true;
d->icon = QIcon();
updateGeometry(); updateGeometry();
if (!(d->states & IconWidgetPrivate::HoverState) && !d->iconChangeTimer->isActive() && !d->oldIcon.isNull()) {
d->animateMainIcon(true, d->states);
} else {
d->oldIcon = QIcon();
update(); update();
}
d->iconChangeTimer->start(300);
d->icon = QIcon();
} }
QString IconWidget::svg() const QString IconWidget::svg() const