From 95607a31cd72680eabe0c33c56e1922047745b64 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 7 Feb 2009 18:56:28 +0000 Subject: [PATCH] The layout algorithm of QListView in Qt4.5 also respects the style-hint QStyle::SH_ScrollView_FrameOnlyAroundContents. To assure that Dolphin uses the maximum available width for the size hint of the items, the style-hint must be included too for Qt 4.5. I tested this fix also with Qt4.4 and it seems that the style-hint returns always 0 in this case -> this patch seems to be backward compatible... svn path=/trunk/KDE/kdebase/apps/; revision=922900 --- src/dolphiniconsview.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 180caae22..f5b69bade 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -411,12 +411,20 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) Q_ASSERT(additionalInfoCount >= 0); itemHeight += additionalInfoCount * m_font.pointSize() * 2; - // optimize the item size of the grid in a way to prevent large gaps on the - // right border (= row arrangement) or the bottom border (= column arrangement) + // Optimize the item size of the grid in a way to prevent large gaps on the + // right border (= row arrangement) or the bottom border (= column arrangement). + // There is no public API in QListView to find out the used width of the viewport + // for the layout. The following calculation of 'contentWidth'/'contentHeight' + // is based on QListViewPrivate::prepareItemsLayout() (Copyright (C) 2009 Nokia Corporation). + int frameAroundContents = 0; + if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) { + frameAroundContents = style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2; + } const int spacing = settings->gridSpacing(); if (settings->arrangement() == QListView::TopToBottom) { - const int contentWidth = viewport()->width() - 1 - - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar()); + const int contentWidth = viewport()->width() - 1 + - frameAroundContents + - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar()); const int gridWidth = itemWidth + spacing * 2; const int horizItemCount = contentWidth / gridWidth; if (horizItemCount > 0) { @@ -429,8 +437,9 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) m_decorationSize = QSize(itemWidth, size); setIconSize(QSize(itemWidth, size)); } else { - const int contentHeight = viewport()->height() - 1 - - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar()); + const int contentHeight = viewport()->height() - 1 + - frameAroundContents + - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar()); const int gridHeight = itemHeight + spacing; const int vertItemCount = contentHeight / gridHeight; if (vertItemCount > 0) { -- 2.47.3