KFileItemListWidget: wrong selection when renamed file ends with a dot

[dolphin.git] / src / kitemviews / kitemlistheader.cpp

diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
index d0a09704e9f1ed183a286338583fc3bd60248ddb..97d0cdfbf3f5e908af417a4dd7a632dfa7388872 100644 (file)
--- a/src/kitemviews/kitemlistheader.cpp
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -28,7 +28,7 @@ bool KItemListHeader::automaticColumnResizing() const
     return m_headerWidget->automaticColumnResizing();
 }
 
     return m_headerWidget->automaticColumnResizing();
 }
 

-void KItemListHeader::setColumnWidth(const QByteArray& role, qreal width)
+void KItemListHeader::setColumnWidth(const QByteArray &role, qreal width)

 {
     if (!m_headerWidget->automaticColumnResizing()) {
         m_headerWidget->setColumnWidth(role, width);
 {
     if (!m_headerWidget->automaticColumnResizing()) {
         m_headerWidget->setColumnWidth(role, width);


@@ -37,15 +37,16 @@ void KItemListHeader::setColumnWidth(const QByteArray& role, qreal width)
     }
 }
 
     }
 }
 

-qreal KItemListHeader::columnWidth(const QByteArray& role) const
+qreal KItemListHeader::columnWidth(const QByteArray &role) const

 {
     return m_headerWidget->columnWidth(role);
 }
 
 {
     return m_headerWidget->columnWidth(role);
 }
 

-void KItemListHeader::setColumnWidths(const QHash<QByteArray, qreal>& columnWidths)
+void KItemListHeader::setColumnWidths(const QHash<QByteArray, qreal> &columnWidths)

 {
     if (!m_headerWidget->automaticColumnResizing()) {
 {
     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);
         }
             const qreal width = columnWidths.value(role);
             m_headerWidget->setColumnWidth(role, width);
         }


@@ -55,21 +56,42 @@ void KItemListHeader::setColumnWidths(const QHash<QByteArray, qreal>& columnWidt
     }
 }
 
     }
 }
 

-qreal KItemListHeader::preferredColumnWidth(const QByteArray& role) const
+qreal KItemListHeader::preferredColumnWidth(const QByteArray &role) const

 {
     return m_headerWidget->preferredColumnWidth(role);
 }
 
 {
     return m_headerWidget->preferredColumnWidth(role);
 }
 

-KItemListHeader::KItemListHeader(KItemListView* listView) :
-    QObject(listView),
-    m_view(listView)
+void KItemListHeader::setSidePadding(qreal leftPaddingWidth, qreal rightPaddingWidth)
+{
+    if (m_headerWidget->leftPadding() != leftPaddingWidth || m_headerWidget->rightPadding() != rightPaddingWidth) {
+        m_headerWidget->setSidePadding(leftPaddingWidth, rightPaddingWidth);
+        if (m_headerWidget->automaticColumnResizing()) {
+            m_view->applyAutomaticColumnWidths();
+        }
+        m_view->doLayout(KItemListView::NoAnimation);
+    }
+}
+
+qreal KItemListHeader::leftPadding() const
+{
+    return m_headerWidget->leftPadding();
+}
+
+qreal KItemListHeader::rightPadding() const
+{
+    return m_headerWidget->rightPadding();
+}
+
+KItemListHeader::KItemListHeader(KItemListView *listView)
+    : QObject(listView)
+    , m_view(listView)

 {
     m_headerWidget = m_view->m_headerWidget;
     Q_ASSERT(m_headerWidget);
 
 {
     m_headerWidget = m_view->m_headerWidget;
     Q_ASSERT(m_headerWidget);
 

-    connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChanged,
-            this, &KItemListHeader::columnWidthChanged);
-    connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChangeFinished,
-            this, &KItemListHeader::columnWidthChangeFinished);
+    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 "moc_kitemlistheader.cpp"