Make it possible to create the shell surface from qml

Change-Id: I83dceff36d1027b24c1dafb3bc44e07f7502bc54

1 files changed, 15 insertions, 8 deletions

diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 30c7a63bf..642a60325 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -58,11 +58,17 @@ WaylandCompositor {
 
     extensions: [
         DefaultShell {
+            id: defaultShell
 
-            onShellSurfaceCreated: {
-                var item = chromeComponent.createObject(primarySurfacesArea);
-                item.surface = surface;
-                shellSurface.view = item.view;
+            Component {
+                id: shellSurfaceComponent
+                DefaultShellSurface { }
+            }
+
+            onCreateShellSurface: {
+                var item = chromeComponent.createObject(primarySurfacesArea, { "surface": surface } );
+                var shellSurface = shellSurfaceComponent.createObject();
+                shellSurface.initialize(defaultShell, surface, item.view, client, id);
             }
 
             Component.onCompleted: {
@@ -71,14 +77,15 @@ WaylandCompositor {
         }
     ]
 
-    Component.onCompleted: {
-        addScreen();
-    }
-
     function addScreen() {
         var screen = screenComponent.createObject(0, { "compositor" : compositor } );
         primarySurfacesArea = screen.surfacesArea;
         var output = compositor.primaryOutputSpace.addOutputWindow(screen, "", "");
         output.automaticFrameCallbacks = true;
     }
+
+    Component.onCompleted: {
+        addScreen();
+    }
+
 }