summaryrefslogtreecommitdiffstats
path: root/wayland/democompositor/qml/main.qml
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2016-08-24 13:19:51 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2016-09-05 09:19:36 +0000
commitb9585b440819e1444b20f30435f81c46801158c5 (patch)
tree9a056ae9ce8400a99ce251a925389bc9c68e242b /wayland/democompositor/qml/main.qml
parent78eb50815059026b50849eb45b95654c59ba88dc (diff)
Update to latest API
Change-Id: Ifb705ae3dfaa12aa23638d3d340c5c17203efb51 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'wayland/democompositor/qml/main.qml')
-rw-r--r--wayland/democompositor/qml/main.qml32
1 files changed, 5 insertions, 27 deletions
diff --git a/wayland/democompositor/qml/main.qml b/wayland/democompositor/qml/main.qml
index 8104db6..8c0c621 100644
--- a/wayland/democompositor/qml/main.qml
+++ b/wayland/democompositor/qml/main.qml
@@ -66,33 +66,11 @@ WaylandCompositor {
}
}
- Component {
- id: surfaceComponent
- WaylandSurface {
+ WlShell {
+ id: defaultShell
+ onWlShellSurfaceCreated: {
+ chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
+ defaultOutput.relayout();
}
}
-
- extensions: [
- Shell {
- id: defaultShell
-
-
- onCreateShellSurface: {
- var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
- item.shellSurface.initialize(defaultShell, surface, client, id);
- }
-
- Component.onCompleted: {
- initialize();
- }
- }
- ]
-
- onCreateSurface: {
- var surface = surfaceComponent.createObject(comp, { } );
- surface.initialize(comp, client, id, version);
- }
- onSurfaceCreated: {
- defaultOutput.relayout()
- }
}