compositor: Add shell property to xdg-shell

Add a shell property to QWaylandXdgSurface and QWaylandXdgPopup
like QWaylandWlShellSurface.

Change-Id: Id321f2ba8a48284c31fe67c4600c86f5c134b68d
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

1 files changed, 36 insertions, 0 deletions

diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 93944fb32..273803d68 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -677,6 +677,7 @@ void QWaylandXdgSurface::initialize(QWaylandXdgShell *xdgShell, QWaylandSurface
     d->m_windowGeometry = d->calculateFallbackWindowGeometry();
     connect(surface, &QWaylandSurface::sizeChanged, this, &QWaylandXdgSurface::handleSurfaceSizeChanged);
     connect(surface, &QWaylandSurface::bufferScaleChanged, this, &QWaylandXdgSurface::handleBufferScaleChanged);
+    emit shellChanged();
     emit surfaceChanged();
     emit windowGeometryChanged();
     QWaylandCompositorExtension::initialize();
@@ -712,6 +713,23 @@ void QWaylandXdgSurface::handleBufferScaleChanged()
 }
 
 /*!
+ * \qmlproperty object QtWaylandCompositor::XdgSurface::shell
+ *
+ * This property holds the shell associated with this XdgSurface.
+ */
+
+/*!
+ * \property QWaylandXdgSurface::shell
+ *
+ * This property holds the shell associated with this QWaylandXdgSurface.
+ */
+QWaylandXdgShell *QWaylandXdgSurface::shell() const
+{
+    Q_D(const QWaylandXdgSurface);
+    return d->m_xdgShell;
+}
+
+/*!
  * \qmlproperty object QtWaylandCompositor::XdgSurface::surface
  *
  * This property holds the surface associated with this XdgSurface.
@@ -1039,12 +1057,30 @@ void QWaylandXdgPopup::initialize(QWaylandXdgShell *shell, QWaylandSurface *surf
     d->m_position = position;
     d->init(resource.resource());
     setExtensionContainer(surface);
+    emit shellChanged();
     emit surfaceChanged();
     emit parentSurfaceChanged();
     QWaylandCompositorExtension::initialize();
 }
 
 /*!
+ * \qmlproperty object QtWaylandCompositor::XdgPopup::shell
+ *
+ * This property holds the shell associated with this XdgPopup.
+ */
+
+/*!
+ * \property QWaylandXdgPopup::shell
+ *
+ * This property holds the shell associated with this QWaylandXdgPopup.
+ */
+QWaylandXdgShell *QWaylandXdgPopup::shell() const
+{
+    Q_D(const QWaylandXdgPopup);
+    return d->m_xdgShell;
+}
+
+/*!
  * \qmlproperty object QtWaylandCompositor::XdgPopup::surface
  *
  * This property holds the surface associated with this XdgPopup.