From cf72e481110d76081d1757dc89da5d8f68627b19 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 14 Feb 2012 23:25:58 +0100 Subject: [PATCH] Minor padding optimizations --- src/kitemviews/kitemlistgroupheader.cpp | 8 +++++--- src/views/dolphinitemlistcontainer.cpp | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/kitemviews/kitemlistgroupheader.cpp b/src/kitemviews/kitemlistgroupheader.cpp index ffc81eb12..4482bab57 100644 --- a/src/kitemviews/kitemlistgroupheader.cpp +++ b/src/kitemviews/kitemlistgroupheader.cpp @@ -133,7 +133,7 @@ void KItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsIt if (m_scrollOrientation == Qt::Horizontal) { painter->setPen(m_lineColor); - const qreal x = m_roleBounds.x() - m_styleOption.padding; + const qreal x = m_roleBounds.x() - 2 * m_styleOption.padding; painter->drawLine(x, 0, x, size().height() - 1); } else if (m_itemIndex > 0) { @@ -200,16 +200,18 @@ void KItemListGroupHeader::updateCache() const QColor c1 = m_styleOption.palette.text().color(); const QColor c2 = m_styleOption.palette.base().color(); m_lineColor = mixedColor(c1, c2, 10); - m_roleColor = mixedColor(c1, c2, 50); + m_roleColor = mixedColor(c1, c2, 70); + int padding = m_styleOption.padding; int horizontalMargin = 0; if (m_scrollOrientation == Qt::Vertical) { // The x-position of the group-header-widget will always be 0, // Add a minimum margin. horizontalMargin = qMax(2, m_styleOption.horizontalMargin); + } else { + padding *= 2; } - const int padding = qMax(2, m_styleOption.padding); const QFontMetrics fontMetrics(m_styleOption.font); const qreal roleHeight = fontMetrics.height(); diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp index 299f32fab..ec1af9549 100644 --- a/src/views/dolphinitemlistcontainer.cpp +++ b/src/views/dolphinitemlistcontainer.cpp @@ -206,7 +206,7 @@ void DolphinItemListContainer::updateGridSize() m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(QSize(iconSize, iconSize)); KItemListStyleOption styleOption = m_fileItemListView->styleOption(); - int padding = 2; + const int padding = 2; int horizontalMargin = 0; int verticalMargin = 0; @@ -246,7 +246,6 @@ void DolphinItemListContainer::updateGridSize() case KFileItemListView::DetailsLayout: { itemWidth = -1; itemHeight = padding * 2 + qMax(iconSize, styleOption.fontMetrics.height()); - padding = 3; break; } default: -- 2.47.3