From 740e9569327c0026257dfcea38ab2efac4a29d67 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 24 Sep 2011 00:18:09 +0200 Subject: Fix size-hint calculation in KFileItemListView The current approach works fine but should be replaced in the longterm by a helper class shared by KFileItemListWidget and KFileItemListView to share information that is required to calculate the size hints in KFileItemListView and to represent the actual data in KFileItemListWidget. --- src/kitemviews/kfileitemlistview.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/kitemviews/kfileitemlistview.cpp') diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index 48e7306fc..68bd7bde9 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -143,7 +143,7 @@ QSizeF KFileItemListView::itemSizeHint(int index) const qreal maximumRequiredWidth = 0.0; foreach (const QByteArray& role, visibleRoles()) { - const QString text = values[role].toString(); + const QString text = KFileItemListWidget::roleText(role, values); const qreal requiredWidth = option.fontMetrics.width(text); maximumRequiredWidth = qMax(maximumRequiredWidth, requiredWidth); } @@ -427,15 +427,14 @@ QSizeF KFileItemListView::visibleRoleSizeHint(int index, const QByteArray& role) qreal width = m_minimumRolesWidths.value(role, 0); const qreal height = option.margin * 2 + option.fontMetrics.height(); - const QVariant value = model()->data(index).value(role); - const QString text = value.toString(); + const QHash values = model()->data(index); + const QString text = KFileItemListWidget::roleText(role, values); if (!text.isEmpty()) { const qreal columnMargin = option.margin * 3; width = qMax(width, qreal(2 * columnMargin + option.fontMetrics.width(text))); } if (role == "name") { - const QHash values = model()->data(index); Q_ASSERT(values.contains("expansionLevel")); // Increase the width by the expansion-toggle and the current expansion level -- cgit v1.3