Merge branch 'master' into frameworks

[dolphin.git] / src / kitemviews / private / kitemlistheaderwidget.cpp

diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index 0f1f20b82bd38ab351e27c8e376b32f681b80ffb..319d9dae368dda8d61bb1bf8655baabd61099138 100644 (file)
--- a/src/kitemviews/private/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -19,7 +19,6 @@
 
 #include "kitemlistheaderwidget.h"
 
-#include <KAction>
 #include <KMenu>
 #include <kitemviews/kitemmodelbase.h>
 
@@ -62,19 +61,19 @@ void KItemListHeaderWidget::setModel(KItemModelBase* model)
     }
 
     if (m_model) {
-        disconnect(m_model, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
-                   this, SLOT(slotSortRoleChanged(QByteArray,QByteArray)));
-        disconnect(m_model, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
-                   this, SLOT(slotSortOrderChanged(Qt::SortOrder,Qt::SortOrder)));
+        disconnect(m_model, &KItemModelBase::sortRoleChanged,
+                   this, &KItemListHeaderWidget::slotSortRoleChanged);
+        disconnect(m_model, &KItemModelBase::sortOrderChanged,
+                   this, &KItemListHeaderWidget::slotSortOrderChanged);
     }
 
     m_model = model;
 
     if (m_model) {
-        connect(m_model, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
-                this, SLOT(slotSortRoleChanged(QByteArray,QByteArray)));
-        connect(m_model, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
-                this, SLOT(slotSortOrderChanged(Qt::SortOrder,Qt::SortOrder)));
+        connect(m_model, &KItemModelBase::sortRoleChanged,
+                this, &KItemListHeaderWidget::slotSortRoleChanged);
+        connect(m_model, &KItemModelBase::sortOrderChanged,
+                this, &KItemListHeaderWidget::slotSortOrderChanged);
     }
 }
 
@@ -181,13 +180,6 @@ void KItemListHeaderWidget::paint(QPainter* painter, const QStyleOptionGraphicsI
         ++orderIndex;
     }
 
-    // Draw background without roles
-    QStyleOption opt;
-    opt.init(widget);
-    opt.rect = QRect(x, 0, size().width() - x, size().height());
-    opt.state |= QStyle::State_Horizontal;
-    style()->drawControl(QStyle::CE_HeaderEmptyArea, &opt, painter);
-
     if (!m_movingRole.pixmap.isNull()) {
         Q_ASSERT(m_roleOperation == MoveRoleOperation);
         painter->drawPixmap(m_movingRole.x, 0, m_movingRole.pixmap);
@@ -334,6 +326,22 @@ void KItemListHeaderWidget::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
     }
 }
 
+void KItemListHeaderWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event)
+{
+    QGraphicsItem::mouseDoubleClickEvent(event);
+
+    const int roleIndex = roleIndexAt(event->pos());
+    if (roleIndex >= 0 && isAboveRoleGrip(event->pos(), roleIndex)) {
+        const QByteArray role = m_columns.at(roleIndex);
+
+        qreal previousWidth = columnWidth(role);
+        setColumnWidth(role, preferredColumnWidth(role));
+        qreal currentWidth = columnWidth(role);
+
+        emit columnWidthChanged(role, currentWidth, previousWidth);
+    }
+}
+
 void KItemListHeaderWidget::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
 {
     QGraphicsWidget::hoverEnterEvent(event);
@@ -405,12 +413,21 @@ void KItemListHeaderWidget::paintRole(QPainter* painter,
     }
     option.rect = rect.toRect();
 
+    bool paintBackgroundForEmptyArea = false;
+
     if (m_columns.count() == 1) {
         option.position = QStyleOptionHeader::OnlyOneSection;
     } else if (orderIndex == 0) {
         option.position = QStyleOptionHeader::Beginning;
     } else if (orderIndex == m_columns.count() - 1) {
-        option.position = QStyleOptionHeader::End;
+        // We are just painting the header for the last column. Check if there
+        // is some empty space to the right which needs to be filled.
+        if (rect.right() < size().width()) {
+            option.position = QStyleOptionHeader::Middle;
+            paintBackgroundForEmptyArea = true;
+        } else {
+            option.position = QStyleOptionHeader::End;
+        }
     } else {
         option.position = QStyleOptionHeader::Middle;
     }
@@ -420,6 +437,20 @@ void KItemListHeaderWidget::paintRole(QPainter* painter,
     option.text = m_model->roleDescription(role);
 
     style()->drawControl(QStyle::CE_Header, &option, painter, widget);
+
+    if (paintBackgroundForEmptyArea) {
+        option.state = QStyle::State_None | QStyle::State_Raised | QStyle::State_Horizontal;
+        option.section = m_columns.count();
+        option.sortIndicator = QStyleOptionHeader::None;
+
+        qreal backgroundRectX = rect.x() + rect.width();
+        QRectF backgroundRect(backgroundRectX, 0.0, size().width() - backgroundRectX, rect.height());
+        option.rect = backgroundRect.toRect();
+        option.position = QStyleOptionHeader::End;
+        option.text = QString();
+
+        style()->drawControl(QStyle::CE_Header, &option, painter, widget);
+    }
 }
 
 void KItemListHeaderWidget::updatePressedRoleIndex(const QPointF& pos)
@@ -537,4 +568,3 @@ qreal KItemListHeaderWidget::roleXPosition(const QByteArray& role) const
     return -1;
 }
 
-#include "kitemlistheaderwidget.moc"