diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 97c8a038b..72d10cf40 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -68,14 +68,6 @@ QSizeF KStandardItemListWidgetInformant::itemSizeHint(int index, const KItemList const qreal maxWidth = itemWidth - 2 * option.padding; QTextLine line; - int emptyRolesCount = 0; - foreach (const QByteArray& role, view->visibleRoles()) { - const QString text = roleText(role, values); - if (role != "text" && role != "rating" && text.isEmpty()) { - emptyRolesCount++; - } - } - // Calculate the number of lines required for wrapping the name QTextOption textOption(Qt::AlignHCenter); textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); @@ -92,7 +84,7 @@ QSizeF KStandardItemListWidgetInformant::itemSizeHint(int index, const KItemList layout.endLayout(); // Add one line for each additional information - textHeight += (additionalRolesCount - emptyRolesCount) * option.fontMetrics.lineSpacing(); + textHeight += additionalRolesCount * option.fontMetrics.lineSpacing(); const qreal maxTextHeight = option.maxTextSize.height(); if (maxTextHeight > 0 && textHeight > maxTextHeight) { @@ -988,17 +980,8 @@ void KStandardItemListWidget::updateIconsLayoutTextCache() qreal nameHeight = 0; QTextLine line; - int emptyRolesCount = 0; - foreach (const QByteArray& role, visibleRoles()) { - const QString text = roleText(role, values); - if (role != "text" && role != "rating" && text.isEmpty()) { - emptyRolesCount++; - } - } - const int additionalRolesCount = qMax(visibleRoles().count() - 1, 0); - const int maxNameLines = (option.maxTextSize.height() / int(lineSpacing)) - - (additionalRolesCount - emptyRolesCount); + const int maxNameLines = (option.maxTextSize.height() / int(lineSpacing)) - additionalRolesCount; QTextLayout layout(nameTextInfo->staticText.text(), m_customizedFont); layout.setTextOption(nameTextInfo->staticText.textOption()); @@ -1032,7 +1015,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache() nameTextInfo->staticText.setTextWidth(maxWidth); nameTextInfo->pos = QPointF(padding, widgetHeight - nameHeight - - (additionalRolesCount - emptyRolesCount)* lineSpacing - + additionalRolesCount * lineSpacing - padding); m_textRect = QRectF(padding + (maxWidth - nameWidth) / 2, nameTextInfo->pos.y(), @@ -1047,11 +1030,6 @@ void KStandardItemListWidget::updateIconsLayoutTextCache() } const QString text = roleText(role, values); - - if (role != "text" && role != "rating" && text.isEmpty()) { - continue; - } - TextInfo* textInfo = m_textInfo.value(role); textInfo->staticText.setText(text); |