1 files changed, 39 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 8ad2389b6..eef51283c 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -235,6 +235,7 @@ void QWaylandSurfacePrivate::surface_commit(Resource *)
 
     // Needed in order to know whether we want to emit signals later
     QSize oldBufferSize = bufferSize;
+    QRectF oldSourceGeometry = sourceGeometry;
     QSize oldDestinationSize = destinationSize;
     bool oldHasContent = hasContent;
     int oldBufferScale = bufferScale;
@@ -244,7 +245,9 @@ void QWaylandSurfacePrivate::surface_commit(Resource *)
         bufferRef = pending.buffer;
     bufferScale = pending.bufferScale;
     bufferSize = bufferRef.size();
-    destinationSize = pending.destinationSize.isEmpty() ? bufferSize / bufferScale : pending.destinationSize;
+    QSize surfaceSize = bufferSize / bufferScale;
+    sourceGeometry = !pending.sourceGeometry.isValid() ? QRect(QPoint(), surfaceSize) : pending.sourceGeometry;
+    destinationSize = pending.destinationSize.isEmpty() ? sourceGeometry.size().toSize() : pending.destinationSize;
     damage = pending.damage.intersected(QRect(QPoint(), destinationSize));
     hasContent = bufferRef.hasContent();
     frameCallbacks << pendingFrameCallbacks;
@@ -252,6 +255,9 @@ void QWaylandSurfacePrivate::surface_commit(Resource *)
     opaqueRegion = pending.opaqueRegion.intersected(QRect(QPoint(), destinationSize));
     QPoint offsetForNextFrame = pending.offset;
 
+    if (viewport)
+        viewport->checkCommittedState();
+
     // Clear per-commit state
     pending.buffer = QWaylandBufferRef();
     pending.offset = QPoint();
@@ -284,6 +290,9 @@ void QWaylandSurfacePrivate::surface_commit(Resource *)
     if (oldDestinationSize != destinationSize)
         emit q->destinationSizeChanged();
 
+    if (oldSourceGeometry != sourceGeometry)
+        emit q->sourceGeometryChanged();
+
     if (oldHasContent != hasContent)
         emit q->hasContentChanged();
 
@@ -471,6 +480,35 @@ bool QWaylandSurface::hasContent() const
 }
 
 /*!
+ * \qmlproperty rect QtWaylandCompositor::WaylandSurface::sourceGeometry
+ *
+ * This property describes the portion of the attached Wayland buffer that should
+ * be drawn on the screen. The coordinates are from the corner of the buffer and are
+ * scaled by \l bufferScale.
+ *
+ * \sa bufferScale
+ * \sa bufferSize
+ * \sa destinationSize
+ */
+
+/*!
+ * \property QWaylandSurface::sourceGeometry
+ *
+ * This property describes the portion of the attached QWaylandBuffer that should
+ * be drawn on the screen. The coordinates are from the corner of the buffer and are
+ * scaled by \l bufferScale.
+ *
+ * \sa bufferScale
+ * \sa bufferSize
+ * \sa destinationSize
+ */
+QRectF QWaylandSurface::sourceGeometry() const
+{
+    Q_D(const QWaylandSurface);
+    return d->sourceGeometry;
+}
+
+/*!
  * \qmlproperty size QtWaylandCompositor::WaylandSurface::destinationSize
  *
  * This property holds the size of this WaylandSurface in surface coordinates.