Minor padding optimizations

diff --git a/src/kitemviews/kitemlistgroupheader.cpp b/src/kitemviews/kitemlistgroupheader.cpp
index ffc81eb120483be421f0052b19f7b059d3693141..4482bab570a0d2df4a5c8d2c4438945e57cbda79 100644 (file)
--- 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);
 
     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) {
         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);
     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);
     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();
 
     const QFontMetrics fontMetrics(m_styleOption.font);
     const qreal roleHeight = fontMetrics.height();
 

diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp
index 299f32fabb9faca9dbe11c5e79d17ff0bf6da17f..ec1af9549a68b901df7e46801a08cf1975076697 100644 (file)
--- 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();
 
     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;
 
     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());
     case KFileItemListView::DetailsLayout: {
         itemWidth = -1;
         itemHeight = padding * 2 + qMax(iconSize, styleOption.fontMetrics.height());

-        padding = 3;

         break;
     }
     default:
         break;
     }
     default: