- when the background gets enabled, recalculate hints

- always add item margins to the hint

svn path=/trunk/KDE/kdelibs/; revision=1119097
This commit is contained in:
Marco Martin 2010-04-26 14:50:54 +00:00
parent e979201682
commit 2fa6d4204c

View File

@ -512,6 +512,7 @@ void IconWidget::setDrawBackground(bool draw)
} }
update(); update();
updateGeometry();
} }
} }
@ -1498,7 +1499,7 @@ QSizeF IconWidget::sizeFromIconSize(const qreal iconWidth) const
d->setActiveMargins(); d->setActiveMargins();
if (d->text.isEmpty() && d->infoText.isEmpty()) { if (d->text.isEmpty() && d->infoText.isEmpty()) {
//no text, just the icon size //no text, just the icon size
return QSizeF(iconWidth, iconWidth); return d->addMargin(QSizeF(iconWidth, iconWidth), IconWidgetPrivate::ItemMargin);
} }
QFontMetricsF fm(d->widgetFont()); QFontMetricsF fm(d->widgetFont());