MCL/sf/mw/qt: comparison src/gui/graphicsview/qgraphicsscene.cpp

equal deleted inserted replaced

-:41300fa6a67c
+:3b1da2848fc7
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 updateAll(false),
 calledEmitUpdated(false),
 processDirtyItemsEmitted(false),
 selectionChanging(0),
 needSortTopLevelItems(true),
+unpolishedItemsModified(true),
 holesInTopLevelSiblingIndex(false),
 topLevelSequentialOrdering(true),
 scenePosDescendantsUpdatePending(false),
 stickyFocus(false),
 hasFocus(false),
 /*!
 \internal
 */
 void QGraphicsScenePrivate::_q_polishItems()
 {
-QSet<QGraphicsItem *>::Iterator it;
+QSet<QGraphicsItem *>::Iterator it = unpolishedItems.begin();
 const QVariant booleanTrueVariant(true);
 while (!unpolishedItems.isEmpty()) {
-it = unpolishedItems.begin();
 QGraphicsItem *item = *it;
-unpolishedItems.erase(it);
+it = unpolishedItems.erase(it);
+unpolishedItemsModified = false;
 if (!item->d_ptr->explicitlyHidden) {
 item->itemChange(QGraphicsItem::ItemVisibleChange, booleanTrueVariant);
 item->itemChange(QGraphicsItem::ItemVisibleHasChanged, booleanTrueVariant);
 }
 if (item->isWidget()) {
 QEvent event(QEvent::Polish);
 QApplication::sendEvent((QGraphicsWidget *)item, &event);
 }
+if (unpolishedItemsModified)
+it = unpolishedItems.begin();
 }
 }
 void QGraphicsScenePrivate::_q_processDirtyItems()
 {
 // Update selected & hovered item bookkeeping
 selectedItems.remove(item);
 hoverItems.removeAll(item);
 cachedItemsUnderMouse.removeAll(item);
 unpolishedItems.remove(item);
+unpolishedItemsModified = true;
 resetDirtyItem(item);
 //We remove all references of item from the sceneEventFilter arrays
 QMultiMap<QGraphicsItem*, QGraphicsItem*>::iterator iterator = sceneEventFilters.begin();
 while (iterator != sceneEventFilters.end()) {
 enabled, the event is sent; otherwise it is stopped.
 */
 bool QGraphicsScenePrivate::sendEvent(QGraphicsItem *item, QEvent *event)
 {
 if (QGraphicsObject *object = item->toGraphicsObject()) {
-if (qt_gestureManager) {
+QGestureManager *gestureManager = QApplicationPrivate::instance()->gestureManager;
-if (qt_gestureManager->filterEvent(object, event))
+if (gestureManager) {
+if (gestureManager->filterEvent(object, event))
 return true;
 }
 }
 if (filterEvent(item, event))
 d_func()->init();
 setSceneRect(x, y, width, height);
 }
 /*!
-Destroys the QGraphicsScene object.
+Removes and deletes all items from the scene object
+before destroying the scene object. The scene object
+is removed from the application's global scene list,
+and it is removed from all associated views.
 */
 QGraphicsScene::~QGraphicsScene()
 {
 Q_D(QGraphicsScene);
 removeItem(group);
 delete group;
 }
 /*!
-Adds or moves the item \a item and all its childen to the scene.
+Adds or moves the \a item and all its childen to this scene.
+This scene takes ownership of the \a item.
 If the item is visible (i.e., QGraphicsItem::isVisible() returns
 true), QGraphicsScene will emit changed() once control goes back
 to the event loop.
-If the item is already in a different scene, it will first be removed from
+If the item is already in a different scene, it will first be
-its old scene, and then added to this scene as a top-level.
+removed from its old scene, and then added to this scene as a
+top-level.
-QGraphicsScene will send ItemSceneChange notifications to \a item while
-it is added to the scene. If item does not currently belong to a scene, only one
+QGraphicsScene will send ItemSceneChange notifications to \a item
-notification is sent. If it does belong to scene already (i.e., it is
+while it is added to the scene. If item does not currently belong
-moved to this scene), QGraphicsScene will send an addition notification as
+to a scene, only one notification is sent. If it does belong to
-the item is removed from its previous scene.
+scene already (i.e., it is moved to this scene), QGraphicsScene
+will send an addition notification as the item is removed from its
-If the item is a panel, the scene is active, and there is no active panel
+previous scene.
-in the scene, then the item will be activated.
+If the item is a panel, the scene is active, and there is no
+active panel in the scene, then the item will be activated.
 \sa removeItem(), addEllipse(), addLine(), addPath(), addPixmap(),
 addRect(), addText(), addWidget(), {QGraphicsItem#Sorting}{Sorting}
 */
 void QGraphicsScene::addItem(QGraphicsItem *item)
 // Resolve font and palette.
 item->d_ptr->resolveFont(d->font.resolve());
 item->d_ptr->resolvePalette(d->palette.resolve());
 if (d->unpolishedItems.isEmpty())
 QMetaObject::invokeMethod(this, "_q_polishItems", Qt::QueuedConnection);
 d->unpolishedItems.insert(item);
+d->unpolishedItemsModified = true;
 // Reenable selectionChanged() for individual items
 --d->selectionChanging;
 if (!d->selectionChanging && d->selectedItems.size() != oldSelectedItemSize)
 emit selectionChanged();
 painter->setOpacity(opacity);
 if (sourced->currentCachedSystem() != Qt::LogicalCoordinates
 && sourced->lastEffectTransform != painter->worldTransform())
 {
+bool unclipped = false;
+if (sourced->lastEffectTransform.type() <= QTransform::TxTranslate
+&& painter->worldTransform().type() <= QTransform::TxTranslate)
+{
+QRectF itemRect = item->boundingRect();
+if (!item->d_ptr->children.isEmpty())
+itemRect |= item->childrenBoundingRect();
+QRectF oldSourceRect = sourced->lastEffectTransform.mapRect(itemRect);
+QRectF newSourceRect = painter->worldTransform().mapRect(itemRect);
+QRect oldEffectRect = sourced->paddedEffectRect(sourced->currentCachedSystem(), sourced->currentCachedMode(), oldSourceRect);
+QRect newEffectRect = sourced->paddedEffectRect(sourced->currentCachedSystem(), sourced->currentCachedMode(), newSourceRect);
+QRect deviceRect(0, 0, painter->device()->width(), painter->device()->height());
+if (deviceRect.contains(oldEffectRect) && deviceRect.contains(newEffectRect)) {
+sourced->setCachedOffset(newEffectRect.topLeft());
+unclipped = true;
+}
+}
 sourced->lastEffectTransform = painter->worldTransform();
-sourced->invalidateCache(QGraphicsEffectSourcePrivate::TransformChanged);
+if (!unclipped)
+sourced->invalidateCache(QGraphicsEffectSourcePrivate::TransformChanged);
 }
 item->d_ptr->graphicsEffect->draw(painter);
 painter->setWorldTransform(restoreTransform);
 sourced->info = 0;
 can increase drawing performance significantly.
 Example:
 \snippet doc/src/snippets/graphicssceneadditemsnippet.cpp 0
+\obsolete Since Qt 4.6, this function is not called anymore unless
+the QGraphicsView::IndirectPainting flag is given as an Optimization
+flag.
 \sa drawBackground(), drawForeground()
 */
 void QGraphicsScene::drawItems(QPainter *painter,
 int numItems,
 }
 }
 }
 }
-Q_ASSERT(qt_gestureManager); // it would be very odd if we got called without a manager.
+QGestureManager *gestureManager = QApplicationPrivate::instance()->gestureManager;
+Q_ASSERT(gestureManager); // it would be very odd if we got called without a manager.
 for (setIter = canceledGestures.begin(); setIter != canceledGestures.end(); ++setIter) {
-qt_gestureManager->recycle(*setIter);
+gestureManager->recycle(*setIter);
 gestureTargets.remove(*setIter);
 }
 }
 QT_END_NAMESPACE

branch	RCL_3
changeset 4	3b1da2848fc7
parent 3	41300fa6a67c
child 5	d3bac044e0f0