Make the default wl_shell available from QML

This finaly ties together how to use QWaylandQuickItems with different
shells

It was required to decouple QWaylandView from the QWaylandQuickItem
since QML doesn't play to well with muliple inheritance. The
QWaylandQuickItem can be retrieved from the QWaylandView which is now
conveniently a QObject. Also the QWaylandQuickItem owns the
QWaylandView. This architecture also leaves room for creating a
QWaylandWidget :)

Change-Id: Ib8a00e6f17f0f1bfc3ff244753f021c76db22cb1

1 files changed, 19 insertions, 4 deletions

diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 18fd45fa..121cb0d2 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -44,6 +44,8 @@ import QtWayland.Compositor 1.0
 WaylandCompositor {
     id: compositor
 
+    property var primarySurfacesArea: null
+
     Component {
         id: screenComponent
         Screen { }
@@ -54,17 +56,30 @@ WaylandCompositor {
         Chrome { }
     }
 
+    extensions: [
+        DefaultShell {
+
+            onShellSurfaceCreated: {
+                var item = chromeComponent.createObject(primarySurfacesArea);
+                item.surface = surface;
+                item.followRequestedPosition = true;
+                shellSurface.view = item.view;
+            }
+
+            Component.onCompleted: {
+                initialize();
+            }
+        }
+    ]
+
     Component.onCompleted: {
         addScreen();
     }
 
     function addScreen() {
         var screen = screenComponent.createObject(0, { "compositor" : compositor } );
+        primarySurfacesArea = screen.surfacesArea;
         var output = compositor.primaryOutputSpace.addOutputWindow(screen, "", "");
         output.automaticFrameCallbacks = true;
     }
-
-    onSurfaceCreated: {
-        var chrome = chromeComponent.createObject(primaryOutputSpace.primaryOutput.window.surfacesArea, { "surface" : surface } );
-    }
 }