From 3a8449ff0a821ab072f66ea43fed6925090fc4d8 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 8 Jul 2020 10:31:22 +0200 Subject: Add iviShell support to example compositors Now that XdgShellV6 is removed, some older Wayland applications (such as weston-terminal and weston-simple-egl in Ubuntu 18.04) would assert when run against our example compositors. Adding IviApplications let them run (although with reduced functionality). Change-Id: If28513f23d4cb362608119db8233eb2e47f794bb Reviewed-by: Eskil Abrahamsen Blomfeldt --- examples/wayland/hwlayer-compositor/main.qml | 1 + examples/wayland/minimal-qml/main.qml | 5 +++++ examples/wayland/pure-qml/qml/main.qml | 5 +++++ 3 files changed, 11 insertions(+) (limited to 'examples') diff --git a/examples/wayland/hwlayer-compositor/main.qml b/examples/wayland/hwlayer-compositor/main.qml index 584c0c353..aaea5b79e 100644 --- a/examples/wayland/hwlayer-compositor/main.qml +++ b/examples/wayland/hwlayer-compositor/main.qml @@ -158,5 +158,6 @@ WaylandCompositor { shellSurfaces.append({shSurface: shellSurface, animatePosition: false, animateOpacity: false, level: 0}); } XdgShell { onToplevelCreated: addShellSurface(xdgSurface) } + IviApplication { onIviSurfaceCreated: addShellSurface(iviSurface) } WlShell { onWlShellSurfaceCreated: addShellSurface(shellSurface) } } diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml index a4e6d89fc..a7709e096 100644 --- a/examples/wayland/minimal-qml/main.qml +++ b/examples/wayland/minimal-qml/main.qml @@ -88,5 +88,10 @@ WaylandCompositor { onToplevelCreated: shellSurfaces.append({shellSurface: xdgSurface}); } + IviApplication { + onIviSurfaceCreated: { + shellSurfaces.append({shellSurface: iviSurface}); + } + } ListModel { id: shellSurfaces } } diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index 5a21735b2..eb4ae9ac1 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -64,6 +64,11 @@ WaylandCompositor { onToplevelCreated: screen.handleShellSurface(xdgSurface) } + // Minimalistic shell extension. Mainly used for embedded applications. + IviApplication { + onIviSurfaceCreated: screen.handleShellSurface(iviSurface) + } + // Deprecated shell extension, still used by some clients WlShell { onWlShellSurfaceCreated: screen.handleShellSurface(shellSurface) -- cgit v1.2.3