Proper handling of scene rect in QGraphicsScene(Index).

Reviewed-by: Andreas

10 files changed, 52 insertions, 61 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 7393f00..e9d1076 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -6322,6 +6322,7 @@ void QGraphicsItem::removeFromIndex()
 void QGraphicsItem::prepareGeometryChange()
 {
     if (d_ptr->scene) {
+        d_ptr->scene->d_func()->dirtyGrowingItemsBoundingRect = true;
         d_ptr->geometryChanged = 1;
         d_ptr->paintedViewBoundingRectsNeedRepaint = 1;
 
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 1dfb140..243582a 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -148,7 +148,7 @@ public:
         dirtyChildrenBoundingRect(1),
         paintedViewBoundingRectsNeedRepaint(0),
         dirtySceneTransform(1),
-        geometryChanged(0),
+        geometryChanged(1),
         inDestructor(0),
         isObject(0),
         ignoreVisible(0),
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 6efede2..de6f5c4 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -326,6 +326,16 @@ void QGraphicsScenePrivate::_q_emitUpdated()
     Q_Q(QGraphicsScene);
     calledEmitUpdated = false;
 
+    if (dirtyGrowingItemsBoundingRect) {
+        if (!hasSceneRect) {
+            const QRectF oldGrowingItemsBoundingRect = growingItemsBoundingRect;
+            growingItemsBoundingRect |= q->itemsBoundingRect();
+            if (oldGrowingItemsBoundingRect != growingItemsBoundingRect)
+                emit q->sceneRectChanged(growingItemsBoundingRect);
+        }
+        dirtyGrowingItemsBoundingRect = false;
+    }
+
     // Ensure all views are connected if anything is connected. This disables
     // the optimization that items send updates directly to the views, but it
     // needs to happen in order to keep compatibility with the behavior from
@@ -373,20 +383,6 @@ void QGraphicsScenePrivate::unregisterTopLevelItem(QGraphicsItem *item)
 
 /*!
     \internal
-
-    Updates all items in the pending update list. At this point, the list is
-    unlikely to contain partially constructed items.
-*/
-void QGraphicsScenePrivate::_q_updateLater()
-{
-    QRectF null;
-    foreach (QGraphicsItem *item, pendingUpdateItems)
-        markDirty(item, null);
-    pendingUpdateItems.clear();
-}
-
-/*!
-    \internal
 */
 void QGraphicsScenePrivate::_q_polishItems()
 {
@@ -412,10 +408,8 @@ void QGraphicsScenePrivate::_q_processDirtyItems()
     const QRectF oldGrowingItemsBoundingRect = growingItemsBoundingRect;
     processDirtyItemsRecursive(0);
     dirtyGrowingItemsBoundingRect = false;
-    if (oldGrowingItemsBoundingRect != growingItemsBoundingRect) {
-        index->sceneRectChanged();
+    if (!hasSceneRect && oldGrowingItemsBoundingRect != growingItemsBoundingRect)
         emit q_func()->sceneRectChanged(growingItemsBoundingRect);
-    }
 
     if (wasPendingSceneUpdate)
         return;
@@ -507,7 +501,6 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
     hoverItems.removeAll(item);
     cachedItemsUnderMouse.removeAll(item);
     unpolishedItems.removeAll(item);
-    pendingUpdateItems.removeAll(item);
     resetDirtyItem(item);
 
     //We remove all references of item from the sceneEventFilter arrays
@@ -1303,18 +1296,19 @@ QGraphicsScene::~QGraphicsScene()
 QRectF QGraphicsScene::sceneRect() const
 {
     Q_D(const QGraphicsScene);
-    if (!d->hasSceneRect && d->dirtyGrowingItemsBoundingRect) {
+    if (d->hasSceneRect)
+        return d->sceneRect;
+
+    if (d->dirtyGrowingItemsBoundingRect) {
         // Lazily update the growing items bounding rect
         QGraphicsScenePrivate *thatd = const_cast<QGraphicsScenePrivate *>(d);
         QRectF oldGrowingBoundingRect = thatd->growingItemsBoundingRect;
         thatd->growingItemsBoundingRect |= itemsBoundingRect();
         thatd->dirtyGrowingItemsBoundingRect = false;
-        if (oldGrowingBoundingRect != thatd->growingItemsBoundingRect) {
-            thatd->index->sceneRectChanged();
+        if (oldGrowingBoundingRect != thatd->growingItemsBoundingRect)
             emit const_cast<QGraphicsScene *>(this)->sceneRectChanged(thatd->growingItemsBoundingRect);
-        }
     }
-    return d->hasSceneRect ? d->sceneRect : d->growingItemsBoundingRect;
+    return d->growingItemsBoundingRect;
 }
 void QGraphicsScene::setSceneRect(const QRectF &rect)
 {
@@ -1322,7 +1316,6 @@ void QGraphicsScene::setSceneRect(const QRectF &rect)
     if (rect != d->sceneRect) {
         d->hasSceneRect = !rect.isNull();
         d->sceneRect = rect;
-        d->index->sceneRectChanged();
         emit sceneRectChanged(d->hasSceneRect ? rect : d->growingItemsBoundingRect);
     }
 }
@@ -2101,13 +2094,8 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
     // Add to list of items that require an update. We cannot assume that the
     // item is fully constructed, so calling item->update() can lead to a pure
     // virtual function call to boundingRect().
-    if (!d->updateAll) {
-        if (d->pendingUpdateItems.isEmpty())
-            QMetaObject::invokeMethod(this, "_q_updateLater", Qt::QueuedConnection);
-        d->pendingUpdateItems << item;
-    } else {
-        d->dirtyGrowingItemsBoundingRect = true;
-    }
+    d->markDirty(item);
+    d->dirtyGrowingItemsBoundingRect = true;
 
     // Disable selectionChanged() for individual items
     ++d->selectionChanging;
@@ -4245,7 +4233,6 @@ void QGraphicsScenePrivate::markDirty(QGraphicsItem *item, const QRectF &rect, b
                                       bool removingItemFromScene)
 {
     Q_ASSERT(item);
-    dirtyGrowingItemsBoundingRect = true;
     if (updateAll)
         return;
 
@@ -4351,6 +4338,13 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
             item->d_ptr->dirty = 0;
             item->d_ptr->paintedViewBoundingRectsNeedRepaint = 0;
         }
+
+        if (item->d_ptr->geometryChanged) {
+            // Update growingItemsBoundingRect.
+            if (!hasSceneRect && !itemIsHidden)
+                growingItemsBoundingRect |= item->d_ptr->sceneTransform.mapRect(item->boundingRect());
+            item->d_ptr->geometryChanged = 0;
+        }
     }
 
     // Process item.
@@ -4359,13 +4353,6 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
         const bool untransformableItem = item->d_ptr->itemIsUntransformable();
         const QRectF itemBoundingRect = adjustedItemBoundingRect(item);
 
-        if (item->d_ptr->geometryChanged) {
-            // Update growingItemsBoundingRect.
-            if (!hasSceneRect)
-                growingItemsBoundingRect |= item->d_ptr->sceneTransform.mapRect(itemBoundingRect);
-            item->d_ptr->geometryChanged = 0;
-        }
-
         if (useCompatUpdate && !untransformableItem && qFuzzyIsNull(item->boundingRegionGranularity())) {
             // This block of code is kept for compatibility. Since 4.5, by default
             // QGraphicsView does not connect the signal and we use the below
diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h
index 421adbd..560671a 100644
--- a/src/gui/graphicsview/qgraphicsscene.h
+++ b/src/gui/graphicsview/qgraphicsscene.h
@@ -291,7 +291,6 @@ private:
     Q_DECLARE_PRIVATE(QGraphicsScene)
     Q_DISABLE_COPY(QGraphicsScene)
     Q_PRIVATE_SLOT(d_func(), void _q_emitUpdated())
-    Q_PRIVATE_SLOT(d_func(), void _q_updateLater())
     Q_PRIVATE_SLOT(d_func(), void _q_polishItems())
     Q_PRIVATE_SLOT(d_func(), void _q_processDirtyItems())
     friend class QGraphicsItem;
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
index 36a7e63..f286a8d 100644
--- a/src/gui/graphicsview/qgraphicsscene_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_p.h
@@ -107,7 +107,6 @@ public:
     QPainterPath selectionArea;
     int selectionChanging;
     QSet<QGraphicsItem *> selectedItems;
-    QList<QGraphicsItem *> pendingUpdateItems;
     QList<QGraphicsItem *> unpolishedItems;
     QList<QGraphicsItem *> topLevelItems;
     bool needSortTopLevelItems;
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
index f6994f9..3efc742 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
@@ -655,10 +655,10 @@ void QGraphicsSceneBspTreeIndex::setBspTreeDepth(int depth)
     This method react to the  \a rect change of the scene and
     reset the BSP tree index.
 */
-void QGraphicsSceneBspTreeIndex::sceneRectChanged()
+void QGraphicsSceneBspTreeIndex::updateSceneRect(const QRectF &rect)
 {
     Q_D(QGraphicsSceneBspTreeIndex);
-    d->sceneRect = d->scene->sceneRect();
+    d->sceneRect = rect;
     d->resetIndex();
 }
 
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
index f2f958f..850cc3f 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
@@ -90,6 +90,9 @@ public:
     int bspTreeDepth();
     void setBspTreeDepth(int depth);
 
+protected Q_SLOTS:
+    void updateSceneRect(const QRectF &rect);
+
 protected:
     bool event(QEvent *event);
     void clear();
@@ -98,7 +101,6 @@ protected:
     void removeItem(QGraphicsItem *item);
     void prepareBoundingRectChange(const QGraphicsItem *item);
 
-    void sceneRectChanged();
     void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const QVariant &value);
 
 private :
diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/gui/graphicsview/qgraphicssceneindex.cpp
index 4eaed2b..88fb6b0 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.cpp
+++ b/src/gui/graphicsview/qgraphicssceneindex.cpp
@@ -335,6 +335,10 @@ void QGraphicsSceneIndexPrivate::recursive_items_helper(QGraphicsItem *item, QRe
 QGraphicsSceneIndex::QGraphicsSceneIndex(QGraphicsScene *scene)
 : QObject(*new QGraphicsSceneIndexPrivate(scene), scene)
 {
+    if (scene) {
+        connect(scene, SIGNAL(sceneRectChanged(const QRectF&)),
+                this, SLOT(updateSceneRect(const QRectF&)));
+    }
 }
 
 /*!
@@ -527,6 +531,18 @@ QList<QGraphicsItem *> QGraphicsSceneIndex::estimateItems(const QPointF &point,
     \a order.
 */
 
+
+/*!
+    Notifies the index that the scene's scene rect has changed. \a rect
+    is thew new scene rect.
+
+    \sa QGraphicsScene::sceneRect()
+*/
+void QGraphicsSceneIndex::updateSceneRect(const QRectF &rect)
+{
+    Q_UNUSED(rect);
+}
+
 /*!
     This virtual function removes all items in the scene index.
 */
@@ -596,15 +612,6 @@ void QGraphicsSceneIndex::prepareBoundingRectChange(const QGraphicsItem *item)
     Q_UNUSED(item);
 }
 
-/*!
-    This virtual function is called when the scene changes its bounding
-    rectangle. \a rect is the new value of the scene rectangle.
-    \sa QGraphicsScene::sceneRect()
-*/
-void QGraphicsSceneIndex::sceneRectChanged()
-{
-}
-
 QT_END_NAMESPACE
 
 #include "moc_qgraphicssceneindex_p.cpp"
diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h
index 60e9032..dc6a740 100644
--- a/src/gui/graphicsview/qgraphicssceneindex_p.h
+++ b/src/gui/graphicsview/qgraphicssceneindex_p.h
@@ -101,6 +101,9 @@ public:
     virtual QList<QGraphicsItem *> estimateItems(const QRectF &rect,
                                                  Qt::SortOrder order, const QTransform &deviceTransform) const = 0;
 
+protected Q_SLOTS:
+    virtual void updateSceneRect(const QRectF &rect);
+
 protected:
     virtual void clear();
     virtual void addItem(QGraphicsItem *item) = 0;
@@ -109,7 +112,6 @@ protected:
 
     virtual void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange, const QVariant &value);
     virtual void prepareBoundingRectChange(const QGraphicsItem *item);
-    virtual void sceneRectChanged();
 
     QGraphicsSceneIndex(QObjectPrivate &dd, QGraphicsScene *scene);
 
diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp
index 694062b..bc401f2 100644
--- a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp
@@ -46,12 +46,6 @@
 */
 
 /*!
-    \fn void QGraphicsSceneLinearIndex::sceneRectChanged(const QRectF &rect);
-    \reimp
-    This method react to the  \a rect change of the scene.
-*/
-
-/*!
     \fn void QGraphicsSceneLinearIndex::clear();
     \reimp
     Clear the all the BSP index.