Fix global coordinate mapping for child widgets in QGraphicsView.

Move the code path handling widgets embedded in QGraphicsProxyWidget
into the loop moving up the parent hierarchy.

Add child widget to test.

Task-number: QTBUG-41135
Change-Id: Ibd86413faaa927145a85a2f5864f162979135053
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 24 insertions, 22 deletions

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index e701eb07ba..88d7cdce76 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -12264,20 +12264,21 @@ QPaintEngine *QWidget::paintEngine() const
 */
 QPoint QWidget::mapToGlobal(const QPoint &pos) const
 {
-#ifndef QT_NO_GRAPHICSVIEW
-    Q_D(const QWidget);
-    if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
-        const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
-        if (!views.isEmpty()) {
-            const QPointF scenePos = d->extra->proxyWidget->mapToScene(pos);
-            const QPoint viewPortPos = views.first()->mapFromScene(scenePos);
-            return views.first()->viewport()->mapToGlobal(viewPortPos);
-        }
-    }
-#endif // !QT_NO_GRAPHICSVIEW
     int x = pos.x(), y = pos.y();
     const QWidget *w = this;
     while (w) {
+#ifndef QT_NO_GRAPHICSVIEW
+        const QWidgetPrivate *d = w->d_func();
+        if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
+            const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
+            if (!views.isEmpty()) {
+                const QPointF scenePos = d->extra->proxyWidget->mapToScene(QPoint(x, y));
+                const QPoint viewPortPos = views.first()->mapFromScene(scenePos);
+                return views.first()->viewport()->mapToGlobal(viewPortPos);
+            }
+        }
+#endif // !QT_NO_GRAPHICSVIEW
+
         QWindow *window = w->windowHandle();
         if (window && window->handle())
             return window->mapToGlobal(QPoint(x, y));
@@ -12299,20 +12300,21 @@ QPoint QWidget::mapToGlobal(const QPoint &pos) const
 */
 QPoint QWidget::mapFromGlobal(const QPoint &pos) const
 {
-#ifndef QT_NO_GRAPHICSVIEW
-    Q_D(const QWidget);
-    if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
-        const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
-        if (!views.isEmpty()) {
-            const QPoint viewPortPos = views.first()->viewport()->mapFromGlobal(pos);
-            const QPointF scenePos = views.first()->mapToScene(viewPortPos);
-            return d->extra->proxyWidget->mapFromScene(scenePos).toPoint();
-        }
-    }
-#endif // !QT_NO_GRAPHICSVIEW
     int x = pos.x(), y = pos.y();
     const QWidget *w = this;
     while (w) {
+#ifndef QT_NO_GRAPHICSVIEW
+        const QWidgetPrivate *d = w->d_func();
+        if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
+            const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
+            if (!views.isEmpty()) {
+                const QPoint viewPortPos = views.first()->viewport()->mapFromGlobal(QPoint(x, y));
+                const QPointF scenePos = views.first()->mapToScene(viewPortPos);
+                return d->extra->proxyWidget->mapFromScene(scenePos).toPoint();
+            }
+        }
+#endif // !QT_NO_GRAPHICSVIEW
+
         QWindow *window = w->windowHandle();
         if (window && window->handle())
             return window->mapFromGlobal(QPoint(x, y));