Port away from deprecated QFontMetrics::width()

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

diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
index d1730a090d85c0062248542d3d5262dd8941e526..a82af44e764eb4184d44901d737f8e4c71f19387 100644 (file)
--- a/src/kitemviews/kitemlistheader.cpp
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
+ *   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  *
@@ -17,77 +17,72 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistheader_p.h"
-
-#include "kitemmodelbase.h"
-
-#include <QFontMetricsF>
-#include <QPainter>
-#include <QStyleOptionHeader>
-
-KItemListHeader::KItemListHeader(QGraphicsWidget* parent) :
-    QGraphicsWidget(parent),
-    m_model(0)
-{
-    QStyleOptionHeader opt;
-    const QSize headerSize = style()->sizeFromContents(QStyle::CT_HeaderSection, &opt, QSize());
-    resize(0, headerSize.height());
-}
+#include "kitemlistheader.h"
+#include "kitemlistview.h"
+#include "private/kitemlistheaderwidget.h"
 
 KItemListHeader::~KItemListHeader()
 {
 }
 
-void KItemListHeader::setModel(KItemModelBase* model)
+void KItemListHeader::setAutomaticColumnResizing(bool automatic)
 {
-    if (m_model == model) {
-        return;
-    }
-
-    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)));
+    if (m_headerWidget->automaticColumnResizing() != automatic) {
+        m_headerWidget->setAutomaticColumnResizing(automatic);
+        if (automatic) {
+            m_view->applyAutomaticColumnWidths();
+            m_view->doLayout(KItemListView::NoAnimation);
+        }
     }
+}
 
-    m_model = model;
+bool KItemListHeader::automaticColumnResizing() const
+{
+    return m_headerWidget->automaticColumnResizing();
+}
 
-    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)));
+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);
     }
 }
 
-KItemModelBase* KItemListHeader::model() const
+qreal KItemListHeader::columnWidth(const QByteArray& role) const
 {
-    return m_model;
+    return m_headerWidget->columnWidth(role);
 }
 
-void KItemListHeader::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+void KItemListHeader::setColumnWidths(const QHash<QByteArray, qreal>& columnWidths)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    if (!m_headerWidget->automaticColumnResizing()) {
+        foreach (const QByteArray& role, m_view->visibleRoles()) {
+            const qreal width = columnWidths.value(role);
+            m_headerWidget->setColumnWidth(role, width);
+        }
 
-    QStyleOption opt;
-    opt.init(widget);
-    opt.rect = rect().toRect();
-    opt.state |= QStyle::State_Horizontal;
-    style()->drawControl(QStyle::CE_HeaderEmptyArea, &opt, painter);
+        m_view->applyColumnWidthsFromHeader();
+        m_view->doLayout(KItemListView::NoAnimation);
+    }
 }
 
-void KItemListHeader::slotSortRoleChanged(const QByteArray& current, const QByteArray& previous)
+qreal KItemListHeader::preferredColumnWidth(const QByteArray& role) const
 {
-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    return m_headerWidget->preferredColumnWidth(role);
 }
 
-void KItemListHeader::slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
+KItemListHeader::KItemListHeader(KItemListView* listView) :
+    QObject(listView),
+    m_view(listView)
 {
-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    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);
 }
 
-#include "kitemlistheader_p.moc"