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

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 // Reenable selectionChanged() for individual items
 --selectionChanging;
 if (!selectionChanging && selectedItems.size() != oldSelectedItemsSize)
 emit q->selectionChanged();
+#ifndef QT_NO_GESTURES
 QHash<QGesture *, QGraphicsObject *>::iterator it;
 for (it = gestureTargets.begin(); it != gestureTargets.end();) {
 if (it.value() == item)
 it = gestureTargets.erase(it);
 else
 ++it;
 }
 QGraphicsObject *dummy = static_cast<QGraphicsObject *>(item);
 cachedTargetItems.removeOne(dummy);
 cachedItemGestures.remove(dummy);
 cachedAlreadyDeliveredGestures.remove(dummy);
 foreach (Qt::GestureType gesture, item->d_ptr->gestureContext.keys())
 ungrabGesture(item, gesture);
+#endif // QT_NO_GESTURES
 }
 /*!
 \internal
 */
 sendEvent(focusItem, &event);
 } else if (keyboardGrabberItems.contains(static_cast<QGraphicsItem *>(widget))) {
 ungrabKeyboard(static_cast<QGraphicsItem *>(widget), itemIsDying);
 }
 if (!itemIsDying && widget->isVisible()) {
-widget->hide();
+widget->QGraphicsItem::d_ptr->setVisibleHelper(false, /* explicit = */ false);
-widget->QGraphicsItem::d_ptr->explicitlyHidden = 0;
 }
 }
 }
 /*!
 enabled, the event is sent; otherwise it is stopped.
 */
 bool QGraphicsScenePrivate::sendEvent(QGraphicsItem *item, QEvent *event)
 {
 if (QGraphicsObject *object = item->toGraphicsObject()) {
+#ifndef QT_NO_GESTURES
 QGestureManager *gestureManager = QApplicationPrivate::instance()->gestureManager;
 if (gestureManager) {
 if (gestureManager->filterEvent(object, event))
 return true;
 }
+#endif // QT_NO_GESTURES
 }
 if (filterEvent(item, event))
 return false;
 if (filterDescendantEvent(item, event))
 if (item != q->focusItem() && item->d_ptr->mouseSetsFocus)
 q->setFocusItem(item, Qt::MouseFocusReason);
 break;
 }
 }
+if (item->d_ptr->flags & QGraphicsItem::ItemStopsClickFocusPropagation)
+break;
 if (item->isPanel())
 break;
 }
 // Check for scene modality.
 if (d->allItemsIgnoreTouchEvents && item->d_ptr->acceptTouchEvents) {
 d->allItemsIgnoreTouchEvents = false;
 d->enableTouchEventsOnViews();
 }
+#ifndef QT_NO_GESTURES
 foreach (Qt::GestureType gesture, item->d_ptr->gestureContext.keys())
 d->grabGesture(item, gesture);
+#endif
 // Update selection lists
 if (item->isSelected())
 d->selectedItems << item;
 if (item->isWidget() && item->isVisible() && static_cast<QGraphicsWidget *>(item)->windowType() == Qt::Popup)
 case QEvent::TouchBegin:
 case QEvent::TouchUpdate:
 case QEvent::TouchEnd:
 d->touchEventHandler(static_cast<QTouchEvent *>(event));
 break;
+#ifndef QT_NO_GESTURES
 case QEvent::Gesture:
 case QEvent::GestureOverride:
 d->gestureEventHandler(static_cast<QGestureEvent *>(event));
 break;
+#endif // QT_NO_GESTURES
 default:
 return QObject::event(event);
 }
 return true;
 }
 Q_D(QGraphicsScene);
 QList<QGraphicsItem *> wheelCandidates = d->itemsAtPosition(wheelEvent->screenPos(),
 wheelEvent->scenePos(),
 wheelEvent->widget());
+#ifdef Q_WS_MAC
+// On Mac, ignore the event if the first item under the mouse is not the last opened
+// popup (or one of its descendant)
+if (!d->popupWidgets.isEmpty() && !wheelCandidates.isEmpty() && wheelCandidates.first() != d->popupWidgets.back() && !d->popupWidgets.back()->isAncestorOf(wheelCandidates.first())) {
+wheelEvent->accept();
+return;
+}
+#else
+// Find the first popup under the mouse (including the popup's descendants) starting from the last.
+// Remove all popups after the one found, or all or them if no popup is under the mouse.
+// Then continue with the event.
+QList<QGraphicsWidget *>::const_iterator iter = d->popupWidgets.end();
+while (--iter >= d->popupWidgets.begin() && !wheelCandidates.isEmpty()) {
+if (wheelCandidates.first() == *iter || (*iter)->isAncestorOf(wheelCandidates.first()))
+break;
+d->removePopup(*iter);
+}
+#endif
 bool hasSetFocus = false;
 foreach (QGraphicsItem *item, wheelCandidates) {
 if (!hasSetFocus && item->isEnabled()
 && ((item->flags() & QGraphicsItem::ItemIsFocusable) && item->d_ptr->mouseSetsFocus)) {
 if (item->isWidget() && static_cast<QGraphicsWidget *>(item)->focusPolicy() == Qt::WheelFocus) {
 {
 Q_ASSERT(item);
 if (updateAll)
 return;
+if (removingItemFromScene && !ignoreOpacity && !item->d_ptr->ignoreOpacity) {
+// If any of the item's ancestors ignore opacity, it means that the opacity
+// was set to 0 (and the update request has not yet been processed). That
+// also means that we have to ignore the opacity for the item itself; otherwise
+// things like: parent->setOpacity(0); scene->removeItem(child) won't work.
+// Note that we only do this when removing items from the scene. In all other
+// cases the ignoreOpacity bit propagates properly in processDirtyItems, but
+// since the item is removed immediately it won't be processed there.
+QGraphicsItem *p = item->d_ptr->parent;
+while (p) {
+if (p->d_ptr->ignoreOpacity) {
+item->d_ptr->ignoreOpacity = true;
+break;
+}
+p = p->d_ptr->parent;
+}
+}
 if (item->d_ptr->discardUpdateRequest(/*ignoreVisibleBit=*/force,
 /*ignoreDirtyBit=*/removingItemFromScene || invalidateChildren,
 /*ignoreOpacity=*/ignoreOpacity)) {
 if (item->d_ptr->dirty) {
 // The item is already marked as dirty and will be processed later. However,
 }
 // Process children.
 if (itemHasChildren && item->d_ptr->dirtyChildren) {
 const bool itemClipsChildrenToShape = item->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape;
-if (itemClipsChildrenToShape) {
+// Items with no content are threated as 'dummy' items which means they are never drawn and
+// 'processed', so the painted view bounding rect is never up-to-date. This means that whenever
+// such an item changes geometry, its children have to take care of the update regardless
+// of whether the item clips children to shape or not.
+const bool bypassUpdateClip = !itemHasContents && wasDirtyParentViewBoundingRects;
+if (itemClipsChildrenToShape && !bypassUpdateClip) {
 // Make sure child updates are clipped to the item's bounding rect.
 for (int i = 0; i < views.size(); ++i)
 views.at(i)->d_func()->setUpdateClip(item);
 }
 if (!dirtyAncestorContainsChildren) {
 }
 void QGraphicsScenePrivate::addView(QGraphicsView *view)
 {
 views << view;
+#ifndef QT_NO_GESTURES
 foreach (Qt::GestureType gesture, grabbedGestures.keys())
 view->viewport()->grabGesture(gesture);
+#endif
 }
 void QGraphicsScenePrivate::removeView(QGraphicsView *view)
 {
 views.removeAll(view);
 QGraphicsSceneHoverEvent hoverEvent;
 hoverEvent.setScenePos(lastSceneMousePos);
 dispatchHoverEvent(&hoverEvent);
 }
+#ifndef QT_NO_GESTURES
 void QGraphicsScenePrivate::gestureTargetsAtHotSpots(const QSet<QGesture *> &gestures,
 Qt::GestureFlag flag,
 QHash<QGraphicsObject *, QSet<QGesture *> > *targets,
 QSet<QGraphicsObject *> *itemsSet,
 QSet<QGesture *> *normal,
 // mark all accepted gestures to deliver them as normal gesture events
 foreach (QGesture *g, gestures) {
 if (ev.isAccepted() || ev.isAccepted(g)) {
 conflictedGestures.remove(g);
 // mark the item as a gesture target
-if (item)
+if (item) {
 gestureTargets.insert(g, item.data());
+QHash<QGraphicsObject *, QSet<QGesture *> >::iterator it, e;
+it = cachedItemGestures.begin();
+e = cachedItemGestures.end();
+for(; it != e; ++it)
+it.value().remove(g);
+cachedItemGestures[item.data()].insert(g);
+}
 DEBUG() << "QGraphicsScenePrivate::gestureEventHandler:"
 << "override was accepted:"
 << g << item.data();
 }
 // remember the first item that received the override event
 void QGraphicsScenePrivate::cancelGesturesForChildren(QGesture *original)
 {
 Q_ASSERT(original);
 QGraphicsItem *originalItem = gestureTargets.value(original);
-Q_ASSERT(originalItem);
+if (originalItem == 0) // we only act on accepted gestures, which implies it has a target.
+return;
 // iterate over all active gestures and for each find the owner
 // if the owner is part of our sub-hierarchy, cancel it.
 QSet<QGesture *> canceledGestures;
 if (!--grabbedGestures[gesture]) {
 foreach (QGraphicsView *view, views)
 view->viewport()->ungrabGesture(gesture);
 }
 }
+#endif // QT_NO_GESTURES
 QT_END_NAMESPACE
 #include "moc_qgraphicsscene.cpp"

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613