Move the qgraphicstreeview over to use graphics items. The view now uses the items to draw the contents and to get item sizehints. There are still some issues to work out; the items are not recycled properly.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/qgraphicstreeview.h b/src/qgraphicstreeview.h
index 56266d1..ccfdc95 100644
--- a/src/qgraphicstreeview.h
+++ b/src/qgraphicstreeview.h
@@ -53,15 +53,15 @@ class QWidget;
 class QtGraphicsTreeViewItem : public QGraphicsWidget
 {
 public:
-    QtGraphicsTreeViewItem(const QTreeModelIterator &it, QtGraphicsTreeView *view);
+    QtGraphicsTreeViewItem(const QTreeModelIterator &it, int index, QtGraphicsTreeView *view);
     ~QtGraphicsTreeViewItem();
 
+    int index() const;
+    void setIndex(int index);
+
     QTreeModelIterator iterator() const;
     void setIterator(const QTreeModelIterator &it);
 
-    int level() const;
-    void setLevel(int level);
-
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     virtual QSizeF sizeHint(const QTreeModelIterator &it, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     virtual QSizeF sizeHint(const QTreeModelIterator &it, int column, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
@@ -84,14 +84,14 @@ class QtGraphicsTreeViewItemCreatorBase
 {
 public:
     virtual ~QtGraphicsTreeViewItemCreatorBase() {}
-    virtual QtGraphicsTreeViewItem *create(const QTreeModelIterator &it, QtGraphicsTreeView *view) const = 0;
+    virtual QtGraphicsTreeViewItem *create(const QTreeModelIterator &it, int index, QtGraphicsTreeView *view) const = 0;
 };
 
 template <class T>
 class QtGraphicsTreeViewItemCreator : public QtGraphicsTreeViewItemCreatorBase
 {
 public:
-    inline QtGraphicsTreeViewItem *create(const QTreeModelIterator &it, QtGraphicsTreeView *view) const { return new T(it, view); }
+    inline QtGraphicsTreeViewItem *create(const QTreeModelIterator &it, int index, QtGraphicsTreeView *view) const { return new T(it, index, view); }
 };
 
 
@@ -141,7 +141,8 @@ public:
 
     //const QList<QtGraphicsTreeViewItem*> &viewItems() const;
 
-    virtual void updateLayout();
+    void updateLayout();
+    virtual void doLayout();
     virtual QTreeModelIterator itemAt(const QPointF &position, QRectF *rect = 0) const;
 
     virtual void initStyleOption(QStyleOptionViewItemV4 *option, QWidget *widget = 0) const;