Compositor: Fix coordinate system inconsistencies

Several properties were using pixel coordinates and surface coordinates without
converting.

[ChangeLog][Compositor] QWaylandSurface::destinationSize has been added which
returns the size of the surface that will be displayed on the screen in surface
coordinates.

[ChangeLog][Compositor] Fixed a bug where QWaylandSurface::inputRegionContains
would return true for some points outside surfaces with buffer scale > 1.

[ChangeLog][Compositor] Fixed a bug which caused ShellSurfaceItems for surfaces
with buffer scale > 1 to move too much when resizing interactively.

It also gets rid of all calls to QWaylandSurface::size, which confusingly
returns the size of the surface's buffer in pixel coordinates. Most properties
now use destionationSize's surface coordinates consistently. Hopefully,
QWaylandSurface::size can be renamed or removed in Qt 6.

Change-Id: I007256a8df7759cf74fbfd51624fa1f90c083336
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

2 files changed, 3 insertions, 3 deletions

diff --git a/examples/wayland/minimal-cpp/compositor.h b/examples/wayland/minimal-cpp/compositor.h
index f06421320..3c0c80e0e 100644
--- a/examples/wayland/minimal-cpp/compositor.h
+++ b/examples/wayland/minimal-cpp/compositor.h
@@ -71,11 +71,11 @@ public:
     QOpenGLTexture *getTexture();
     int iviId() const { return m_iviId; }
 
-    QRect globalGeometry() const { return QRect(globalPosition(), surface()->size()); }
+    QRect globalGeometry() const { return QRect(globalPosition(), surface()->destinationSize()); }
     void setGlobalPosition(const QPoint &globalPos) { m_pos = globalPos; m_positionSet = true; }
     QPoint globalPosition() const { return m_pos; }
     QPoint mapToLocal(const QPoint &globalPos) const;
-    QSize size() const { return surface() ? surface()->size() : QSize(); }
+    QSize size() const { return surface() ? surface()->destinationSize() : QSize(); }
 
     void initPosition(const QSize &screenSize, const QSize &surfaceSize);
 
diff --git a/examples/wayland/minimal-cpp/window.cpp b/examples/wayland/minimal-cpp/window.cpp
index 673e15fd8..f345bd51f 100644
--- a/examples/wayland/minimal-cpp/window.cpp
+++ b/examples/wayland/minimal-cpp/window.cpp
@@ -95,7 +95,7 @@ void Window::paintGL()
         GLuint textureId = texture->textureId();
         QWaylandSurface *surface = view->surface();
         if (surface && surface->hasContent()) {
-            QSize s = surface->size();
+            QSize s = surface->destinationSize();
             view->initPosition(size(), s);
             QPointF pos = view->globalPosition();
             QRectF surfaceGeometry(pos, s);