Initialize d->numDisplayLines
(and i wondered why sizeFromIconSize() seemed to have a non deterministic behaviour :P) svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=781244
This commit is contained in:
parent
fd0adac258
commit
2d34c6777c
@ -62,6 +62,7 @@ Icon::Private::Private()
|
|||||||
iconSize(48, 48),
|
iconSize(48, 48),
|
||||||
states(Private::NoState),
|
states(Private::NoState),
|
||||||
orientation(Qt::Vertical),
|
orientation(Qt::Vertical),
|
||||||
|
numDisplayLines(2),
|
||||||
invertLayout(false),
|
invertLayout(false),
|
||||||
drawBg(false)
|
drawBg(false)
|
||||||
{
|
{
|
||||||
@ -1140,7 +1141,7 @@ QSizeF Icon::sizeFromIconSize(const qreal iconWidth) const
|
|||||||
Private::ItemMargin);
|
Private::ItemMargin);
|
||||||
}
|
}
|
||||||
|
|
||||||
QFontMetricsF fm(font());
|
QFontMetricsF fm = Plasma::Theme::self()->fontMetrics();
|
||||||
//make room for at most 14 characters
|
//make room for at most 14 characters
|
||||||
qreal width = qMax(fm.width(d->text.left(12)),
|
qreal width = qMax(fm.width(d->text.left(12)),
|
||||||
fm.width(d->infoText.left(12))) +
|
fm.width(d->infoText.left(12))) +
|
||||||
|
Loading…
Reference in New Issue
Block a user