diff options
| author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-04-11 12:51:21 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@theqtcompany.com> | 2016-04-11 15:49:02 +0000 |
| commit | 44f4395879ec9464c0a6dd3a7635fad05ad14118 (patch) | |
| tree | a65a7eda1c4aac7101eedd42787c0483e442101b /examples | |
| parent | f2e42b438d221ab007e9d3a0cbac1d34634b66e6 (diff) | |
Simplify ShellSurfaceItem creationv5.7.0-beta1
Use onShellSurfaceCreated instead of onCreateShellSurface.
A QWaylandWlShellSurface is no longer created in
QWaylandWlShellSurfaceItem::componentComplete
Change-Id: I7a0dbbacddc17ab32ed0e4d16e717fcefb221947
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Erik Larsson <erik@ortogonal.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/custom-extension/compositor/qml/main.qml | 5 | ||||
| -rw-r--r-- | examples/wayland/multi-output/qml/main.qml | 7 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml index 54d0707ac..dcba2bb70 100644 --- a/examples/wayland/custom-extension/compositor/qml/main.qml +++ b/examples/wayland/custom-extension/compositor/qml/main.qml @@ -78,9 +78,8 @@ WaylandCompositor { WlShell { id: defaultShell - onCreateShellSurface: { - var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } ); - item.shellSurface.initialize(defaultShell, surface, resource); + onShellSurfaceCreated: { + var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } ); lastItem = item; } diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml index 9e11d3613..ccb3d418b 100644 --- a/examples/wayland/multi-output/qml/main.qml +++ b/examples/wayland/multi-output/qml/main.qml @@ -85,10 +85,9 @@ WaylandCompositor { WlShell { id: defaultShell - onCreateShellSurface: { - var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } ); - item.shellSurface.initialize(defaultShell, surface, resource); - surface.activated.connect(item.raise); + onShellSurfaceCreated: { + var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } ); + item.surface.activated.connect(item.raise); } Component.onCompleted: { diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index d706945e2..a8a3985de 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -66,10 +66,8 @@ WaylandCompositor { WlShell { id: defaultShell - - onCreateShellSurface: { - var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } ); - item.shellSurface.initialize(defaultShell, surface, resource); + onShellSurfaceCreated: { + chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } ); } Component.onCompleted: { |