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

reset any svg icon if a normal one gets set

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1117890
This commit is contained in:
Marco Martin 2010-04-23 11:35:43 +00:00
parent 93949358d3
commit 5d9b77ed76
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/iconwidget.cpp
View File

@ -626,6 +626,14 @@ void IconWidgetPrivate::layoutIcons(const QStyleOptionGraphicsItem *option)
void IconWidget::setSvg(const QString &svgFilePath, const QString &elementId) void IconWidget::setSvg(const QString &svgFilePath, const QString &elementId)
{ {
if (svgFilePath.isEmpty()) {
if (d->iconSvg) {
d->iconSvg->deleteLater();
d->iconSvg = 0;
}
return;
}
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()));
@ -1219,6 +1227,8 @@ void IconWidget::setIcon(const QString &icon)
void IconWidget::setIcon(const QIcon &icon) void IconWidget::setIcon(const QIcon &icon)
{ {
setSvg(QString());
/*fade to the new icon, but to not bee a too big hog, not do that when: /*fade to the new icon, but to not bee a too big hog, not do that when:
- the fade animation is already running - the fade animation is already running
- the icon is under mouse - the icon is under mouse