Enable shell surface on qwindow compositor

Change-Id: I210ddf347c077c3ea8b4e7b6ab00fb20ba5cbffb

2 files changed, 16 insertions, 5 deletions

diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
index bba560341..0f8462211 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
@@ -116,6 +116,9 @@ QWindowCompositor::QWindowCompositor(CompositorWindow *window)
 
     QOpenGLFunctions *functions = m_window->context()->functions();
     functions->glGenFramebuffers(1, &m_surface_fbo);
+
+    QtWayland::Shell *shell = new QtWayland::Shell(this);
+    connect(shell, &QtWayland::Shell::shellSurfaceCreated, this, &QWindowCompositor::onShellSurfaceCreated);
 }
 
 QWindowCompositor::~QWindowCompositor()
@@ -218,11 +221,6 @@ void QWindowCompositor::surfaceUnmapped()
     m_renderScheduler.start(0);
 }
 
-QWaylandView *QWindowCompositor::createView()
-{
-    return new SurfaceView();
-}
-
 void QWindowCompositor::surfaceCommitted()
 {
     QWaylandSurface *surface = qobject_cast<QWaylandSurface *>(sender());
@@ -247,6 +245,13 @@ void QWindowCompositor::onSurfaceCreated(QWaylandSurface *surface)
     connect(surface, SIGNAL(unmapped()), this, SLOT(surfaceUnmapped()));
     connect(surface, SIGNAL(redraw()), this, SLOT(surfaceCommitted()));
     connect(surface, SIGNAL(extendedSurfaceReady()), this, SLOT(sendExpose()));
+}
+
+void QWindowCompositor::onShellSurfaceCreated(QWaylandSurface *surface, QtWayland::ShellSurface *shellSurface)
+{
+    SurfaceView *newView = new SurfaceView();
+    newView->setSurface(surface);
+    shellSurface->setView(newView);
     m_renderScheduler.start(0);
 }
 
diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.h b/examples/wayland/qwindow-compositor/qwindowcompositor.h
index db7f9129a..7534b57b0 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.h
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.h
@@ -53,6 +53,11 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWayland {
+    class Shell;
+    class ShellSurface;
+}
+
 class QWaylandView;
 class QOpenGLTexture;
 
@@ -73,6 +78,7 @@ private slots:
 
     void render();
     void onSurfaceCreated(QWaylandSurface *surface);
+    void onShellSurfaceCreated(QWaylandSurface *surface, QtWayland::ShellSurface *shellSurface);
 protected:
     QWaylandView *createView() Q_DECL_OVERRIDE;
     void surfaceCommitted(QWaylandSurface *surface);