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

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 #include <QtGui/qpainter.h>
 #include <QtGui/qscrollbar.h>
 #include <QtGui/qstyleoption.h>
 #include <QtGui/qinputcontext.h>
 #ifdef Q_WS_X11
+#include <QtGui/qpaintengine.h>
 #include <private/qt_x11_p.h>
 #endif
 #include <private/qevent_p.h>
 return scrollY;
 }
 /*!
 \internal
+Maps the given rectangle to the scene using QTransform::mapRect()
+*/
+QRectF QGraphicsViewPrivate::mapRectToScene(const QRect &rect) const
+{
+if (dirtyScroll)
+const_cast<QGraphicsViewPrivate *>(this)->updateScroll();
+QRectF scrolled = QRectF(rect.translated(scrollX, scrollY));
+return identityMatrix ? scrolled : matrix.inverted().mapRect(scrolled);
+}
+/*!
+\internal
+Maps the given rectangle from the scene using QTransform::mapRect()
+*/
+QRectF QGraphicsViewPrivate::mapRectFromScene(const QRectF &rect) const
+{
+if (dirtyScroll)
+const_cast<QGraphicsViewPrivate *>(this)->updateScroll();
+return (identityMatrix ? rect : matrix.mapRect(rect)).translated(-scrollX, -scrollY);
+}
+/*!
+\internal
 */
 void QGraphicsViewPrivate::updateScroll()
 {
 Q_Q(QGraphicsView);
 scrollX = qint64(-leftIndent);
 }
 // Step 2) If the expose region is a simple rect and the view is only
 // translated or scaled, search for items using
 // QGraphicsScene::items(QRectF).
-bool simpleRectLookup =  exposedRegion.numRects() == 1 && matrix.type() <= QTransform::TxScale;
+bool simpleRectLookup =  exposedRegion.rectCount() == 1 && matrix.type() <= QTransform::TxScale;
 if (simpleRectLookup) {
 return scene->items(exposedRegionSceneBounds,
 Qt::IntersectsItemBoundingRect,
 Qt::AscendingOrder, viewTransform);
 }
 }
 void QGraphicsView::setTransformationAnchor(ViewportAnchor anchor)
 {
 Q_D(QGraphicsView);
 d->transformationAnchor = anchor;
+// Ensure mouse tracking is enabled in the case we are using AnchorUnderMouse
+// in order to have up-to-date information for centering the view.
+if (d->transformationAnchor == AnchorUnderMouse)
+d->viewport->setMouseTracking(true);
 }
 /*!
 \property QGraphicsView::resizeAnchor
 \brief how the view should position the scene when the view is resized.
 }
 void QGraphicsView::setResizeAnchor(ViewportAnchor anchor)
 {
 Q_D(QGraphicsView);
 d->resizeAnchor = anchor;
+// Ensure mouse tracking is enabled in the case we are using AnchorUnderMouse
+// in order to have up-to-date information for centering the view.
+if (d->resizeAnchor == AnchorUnderMouse)
+d->viewport->setMouseTracking(true);
 }
 /*!
 \property QGraphicsView::viewportUpdateMode
 \brief how the viewport should update its contents.
 this, SLOT(updateScene(QList<QRectF>)));
 disconnect(d->scene, SIGNAL(sceneRectChanged(QRectF)),
 this, SLOT(updateSceneRect(QRectF)));
 d->scene->d_func()->removeView(this);
 d->connectedToScene = false;
+if (isActiveWindow() && isVisible()) {
+QEvent windowDeactivate(QEvent::WindowDeactivate);
+QApplication::sendEvent(d->scene, &windowDeactivate);
+}
+if(hasFocus())
+d->scene->clearFocus();
 }
 // Assign the new scene and update the contents (scrollbars, etc.)).
 if ((d->scene = scene)) {
 connect(d->scene, SIGNAL(sceneRectChanged(QRectF)),
 }
 // enable touch events if any items is interested in them
 if (!d->scene->d_func()->allItemsIgnoreTouchEvents)
 d->viewport->setAttribute(Qt::WA_AcceptTouchEvents);
+if (isActiveWindow() && isVisible()) {
+QEvent windowActivate(QEvent::WindowActivate);
+QApplication::sendEvent(d->scene, &windowActivate);
+}
 } else {
 d->recalculateContentSize();
 }
 d->updateInputMethodSensitivity();
 // autoFillBackground enables scroll acceleration.
 widget->setAutoFillBackground(true);
 }
 // We are only interested in mouse tracking if items
-// accept hover events or use non-default cursors.
+// accept hover events or use non-default cursors or if
-if (d->scene && (!d->scene->d_func()->allItemsIgnoreHoverEvents
+// AnchorUnderMouse is used as transformation or resize anchor.
-|| !d->scene->d_func()->allItemsUseDefaultCursor)) {
+if ((d->scene && (!d->scene->d_func()->allItemsIgnoreHoverEvents
+|| !d->scene->d_func()->allItemsUseDefaultCursor))
+|| d->transformationAnchor == AnchorUnderMouse
+|| d->resizeAnchor == AnchorUnderMouse) {
 widget->setMouseTracking(true);
 }
 // enable touch events if any items is interested in them
 if (d->scene && !d->scene->d_func()->allItemsIgnoreTouchEvents)
 // Remove all popups when the scene loses focus.
 if (!d->scene->d_func()->popupWidgets.isEmpty())
 d->scene->d_func()->removePopup(d->scene->d_func()->popupWidgets.first());
 QApplication::sendEvent(d->scene, event);
 break;
+case QEvent::Show:
+if (d->scene && isActiveWindow()) {
+QEvent windowActivate(QEvent::WindowActivate);
+QApplication::sendEvent(d->scene, &windowActivate);
+}
+break;
+case QEvent::Hide:
+// spontaneous event will generate a WindowDeactivate.
+if (!event->spontaneous() && d->scene && isActiveWindow()) {
+QEvent windowDeactivate(QEvent::WindowDeactivate);
+QApplication::sendEvent(d->scene, &windowDeactivate);
+}
+break;
 case QEvent::Leave:
 // ### This is a temporary fix for until we get proper mouse grab
 // events. activeMouseGrabberItem should be set to 0 if we lose the
 // mouse grab.
 if ((QApplication::activePopupWidget() && QApplication::activePopupWidget() != window())
 if (!d->backgroundPixmapExposed.isEmpty()) {
 QPainter backgroundPainter(&d->backgroundPixmap);
 backgroundPainter.setClipRegion(d->backgroundPixmapExposed, Qt::ReplaceClip);
 if (viewTransformed)
 backgroundPainter.setTransform(viewTransform);
-backgroundPainter.setCompositionMode(QPainter::CompositionMode_Source);
+#ifdef Q_WS_X11
+#undef X11
+if (backgroundPainter.paintEngine()->type() != QPaintEngine::X11)
+#define X11 qt_x11Data
+#endif
+backgroundPainter.setCompositionMode(QPainter::CompositionMode_Source);
 drawBackground(&backgroundPainter, exposedSceneRect);
 d->backgroundPixmapExposed = QRegion();
 }
 // Blit the background from the background pixmap
 // Items
 if (!(d->optimizationFlags & IndirectPainting)) {
 d->scene->d_func()->drawItems(&painter, viewTransformed ? &viewTransform : 0,
 &d->exposedRegion, viewport());
+// Make sure the painter's world transform is restored correctly when
+// drawing without painter state protection (DontSavePainterState).
+// We only change the worldTransform() so there's no need to do a full-blown
+// save() and restore(). Also note that we don't have to do this in case of
+// IndirectPainting (the else branch), because in that case we always save()
+// and restore() in QGraphicsScene::drawItems().
+if (!d->scene->d_func()->painterStateProtection)
+painter.setWorldTransform(viewTransform);
 } else {
 // Find all exposed items
 bool allItems = false;
 QList<QGraphicsItem *> itemList = d->findItems(d->exposedRegion, &allItems, viewTransform);
 if (!itemList.isEmpty()) {

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7