X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3f88f79f862a570b68fe64781955cf7d14124127..ca0d0bb322925e2119f13f76d8e9643d24cbf3e0:/src/kitemviews/kitemlistheader.cpp

diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
index f1050538d..64d6a2559 100644
--- a/src/kitemviews/kitemlistheader.cpp
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -1,25 +1,12 @@
-/***************************************************************************
- *   Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2012 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "kitemlistheader.h"
-#include "kitemlistheaderwidget_p.h"
 #include "kitemlistview.h"
+#include "private/kitemlistheaderwidget.h"
 
 KItemListHeader::~KItemListHeader()
 {
@@ -30,7 +17,8 @@ void KItemListHeader::setAutomaticColumnResizing(bool automatic)
     if (m_headerWidget->automaticColumnResizing() != automatic) {
         m_headerWidget->setAutomaticColumnResizing(automatic);
         if (automatic) {
-            m_view->updateColumnWidthsForHeader();
+            m_view->applyAutomaticColumnWidths();
+            m_view->doLayout(KItemListView::NoAnimation);
         }
     }
 }
@@ -45,6 +33,7 @@ void KItemListHeader::setColumnWidth(const QByteArray& role, qreal width)
     if (!m_headerWidget->automaticColumnResizing()) {
         m_headerWidget->setColumnWidth(role, width);
         m_view->applyColumnWidthsFromHeader();
+        m_view->doLayout(KItemListView::NoAnimation);
     }
 }
 
@@ -56,24 +45,48 @@ qreal KItemListHeader::columnWidth(const QByteArray& role) const
 void KItemListHeader::setColumnWidths(const QHash<QByteArray, qreal>& columnWidths)
 {
     if (!m_headerWidget->automaticColumnResizing()) {
-        foreach (const QByteArray& role, m_view->visibleRoles()) {
+        const auto visibleRoles = m_view->visibleRoles();
+        for (const QByteArray& role : visibleRoles) {
             const qreal width = columnWidths.value(role);
             m_headerWidget->setColumnWidth(role, width);
         }
 
         m_view->applyColumnWidthsFromHeader();
+        m_view->doLayout(KItemListView::NoAnimation);
     }
 }
 
+qreal KItemListHeader::preferredColumnWidth(const QByteArray& role) const
+{
+    return m_headerWidget->preferredColumnWidth(role);
+}
+
+void KItemListHeader::setSidePadding(qreal width){
+    if (m_headerWidget->sidePadding() != width) {
+        m_headerWidget->setSidePadding(width);
+        if (m_headerWidget->automaticColumnResizing()) {
+            m_view->applyAutomaticColumnWidths();
+        }
+        m_view->doLayout(KItemListView::NoAnimation);
+    }
+}
+
+qreal KItemListHeader::sidePadding() const{
+    return m_headerWidget->sidePadding();
+}
+
 KItemListHeader::KItemListHeader(KItemListView* listView) :
-    QObject(listView->parent()),
+    QObject(listView),
     m_view(listView)
 {
     m_headerWidget = m_view->m_headerWidget;
     Q_ASSERT(m_headerWidget);
 
-    connect(m_headerWidget, SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
-            this, SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)));
+    connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChanged,
+            this, &KItemListHeader::columnWidthChanged);
+    connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChangeFinished,
+            this, &KItemListHeader::columnWidthChangeFinished);
+    connect(m_headerWidget, &KItemListHeaderWidget::sidePaddingChanged,
+            this, &KItemListHeader::sidePaddingChanged);
 }
 
-#include "kitemlistheader.moc"