a bit more spacing to avoid ellipsis

svn path=/trunk/KDE/kdelibs/; revision=1060754
This commit is contained in:
Marco Martin 2009-12-09 20:10:22 +00:00
parent aa92a6c236
commit 92d3cdc0a3

View File

@ -1364,7 +1364,7 @@ QSizeF IconWidget::sizeFromIconSize(const qreal iconWidth) const
// make room for at most 14 characters
width = qMax(d->maxWordWidth(d->text),
d->maxWordWidth(d->infoText)) +
fm.width("xx") +
fm.width("xxx") +
d->horizontalMargin[IconWidgetPrivate::TextMargin].left +
d->horizontalMargin[IconWidgetPrivate::TextMargin].right;
@ -1376,7 +1376,7 @@ QSizeF IconWidget::sizeFromIconSize(const qreal iconWidth) const
width = iconWidth +
d->horizontalMargin[IconWidgetPrivate::IconMargin].left +
d->horizontalMargin[IconWidgetPrivate::IconMargin].right +
qMax(fm.width(d->text), fm.width(d->infoText)) + fm.width("xx") +
qMax(fm.width(d->text), fm.width(d->infoText)) + fm.width("xxx") +
d->horizontalMargin[IconWidgetPrivate::TextMargin].left +
d->horizontalMargin[IconWidgetPrivate::TextMargin].right;
}
@ -1386,7 +1386,7 @@ QSizeF IconWidget::sizeFromIconSize(const qreal iconWidth) const
QStyleOptionGraphicsItem option;
option.state = QStyle::State_None;
option.rect = boundingRect().toRect();
option.rect = QRect(0, 0, width, QWIDGETSIZE_MAX);
textHeight = d->displaySizeHint(&option, width).height();
if (d->orientation == Qt::Vertical) {