Compositor: Fix popup positions on screens when DPR != 1

[ChangeLog][Compositor] Fixed a bug where xdg-shell popups were misplaced when
devicePixelRatio was not 1.

The fix is to use the more robust QWaylandQuickItem::mapFromSurface instead.

Also made wl-shell use mapFromSurface, although it already accounted for
devicePixelRatio.

Fixes: QTBUG-70662
Change-Id: I8be3ea76d6bcfd6d6974d532d160c20e44499382
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

4 files changed, 12 insertions, 12 deletions

diff --git a/src/compositor/extensions/qwaylandwlshellintegration.cpp b/src/compositor/extensions/qwaylandwlshellintegration.cpp
index 896b1587d..a2b6b1224 100644
--- a/src/compositor/extensions/qwaylandwlshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandwlshellintegration.cpp
@@ -217,9 +217,7 @@ void WlShellIntegration::handleSetPopup(QWaylandSeat *seat, QWaylandSurface *par
         t.clear(&t);
         m_item->setRotation(0);
         m_item->setScale(1.0);
-        auto scaleFactor = m_item->output()->scaleFactor() / devicePixelRatio();
-        m_item->setX(relativeToParent.x() * scaleFactor);
-        m_item->setY(relativeToParent.y() * scaleFactor);
+        m_item->setPosition(m_item->mapFromSurface(relativeToParent));
         m_item->setParentItem(parentItem);
     }
 
diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index cc8faf6c7..9ec2810b2 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -285,11 +285,11 @@ void XdgPopupIntegration::handleGeometryChanged()
 {
     if (m_item->view()->output()) {
         const QPoint windowOffset = m_popup->parentXdgSurface()->windowGeometry().topLeft();
-        const QPoint position = m_popup->unconstrainedPosition() + windowOffset;
+        const QPoint surfacePosition = m_popup->unconstrainedPosition() + windowOffset;
+        const QPoint itemPosition = m_item->mapFromSurface(surfacePosition).toPoint();
         //TODO: positioner size or other size...?
-        const float scaleFactor = m_item->view()->output()->scaleFactor();
         //TODO check positioner constraints etc... sliding, flipping
-        m_item->moveItem()->setPosition(position * scaleFactor);
+        m_item->moveItem()->setPosition(itemPosition);
     } else {
         qWarning() << "XdgPopupIntegration popup item without output" << m_item;
     }
diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration.cpp b/src/compositor/extensions/qwaylandxdgshellv5integration.cpp
index ea04a33d2..d21aa4428 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5integration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv5integration.cpp
@@ -212,10 +212,12 @@ XdgPopupV5Integration::XdgPopupV5Integration(QWaylandQuickShellSurfaceItem *item
     , m_xdgShell(QWaylandXdgPopupV5Private::get(m_xdgPopup)->m_xdgShell)
 {
     item->setSurface(m_xdgPopup->surface());
-    if (item->view()->output())
-        item->moveItem()->setPosition(QPointF(m_xdgPopup->position() * item->view()->output()->scaleFactor()));
-    else
+    if (item->view()->output()) {
+        QPoint position = item->mapFromSurface(m_xdgPopup->position()).toPoint();
+        item->moveItem()->setPosition(position);
+    } else {
         qWarning() << "XdgPopupV5Integration popup item without output" << item;
+    }
 
     QWaylandClient *client = m_xdgPopup->surface()->client();
     auto shell = m_xdgShell;
diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp
index 61a9092a3..0dd8df6f8 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp
@@ -285,11 +285,11 @@ void XdgPopupV6Integration::handleGeometryChanged()
 {
     if (m_item->view()->output()) {
         const QPoint windowOffset = m_popup->parentXdgSurface()->windowGeometry().topLeft();
-        const QPoint position = m_popup->unconstrainedPosition() + windowOffset;
+        const QPoint surfacePosition = m_popup->unconstrainedPosition() + windowOffset;
+        const QPoint itemPosition = m_item->mapFromSurface(surfacePosition).toPoint();
         //TODO: positioner size or other size...?
-        const float scaleFactor = m_item->view()->output()->scaleFactor();
         //TODO check positioner constraints etc... sliding, flipping
-        m_item->moveItem()->setPosition(position * scaleFactor);
+        m_item->moveItem()->setPosition(itemPosition);
     } else {
         qWarning() << "XdgPopupV6Integration popup item without output" << m_item;
     }