From 8d437e79cdd41ede195ed1829d59b2b012b4d40d Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 22 Sep 2016 10:15:23 +0200 Subject: Compositor: Add a spanning screens example This example shows how one application can be displayed full screen spanning two screens. The intended use case is for running applications with lots of scrolling content, such as a web browser. Change-Id: Icba2715aa7ccd79c9d44c7e1d621bfdd9e51e66c Reviewed-by: Paul Olav Tvete --- examples/wayland/spanning-screens/main.cpp | 55 +++++++++ examples/wayland/spanning-screens/main.qml | 126 +++++++++++++++++++++ .../wayland/spanning-screens/spanning-screens.pro | 14 +++ .../wayland/spanning-screens/spanning-screens.qrc | 5 + examples/wayland/wayland.pro | 1 + 5 files changed, 201 insertions(+) create mode 100644 examples/wayland/spanning-screens/main.cpp create mode 100644 examples/wayland/spanning-screens/main.qml create mode 100644 examples/wayland/spanning-screens/spanning-screens.pro create mode 100644 examples/wayland/spanning-screens/spanning-screens.qrc diff --git a/examples/wayland/spanning-screens/main.cpp b/examples/wayland/spanning-screens/main.cpp new file mode 100644 index 000000000..17e44b34b --- /dev/null +++ b/examples/wayland/spanning-screens/main.cpp @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include + +#include + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + QQmlApplicationEngine appEngine(QUrl("qrc:///main.qml")); + + return app.exec(); +} diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml new file mode 100644 index 000000000..00bf517fc --- /dev/null +++ b/examples/wayland/spanning-screens/main.qml @@ -0,0 +1,126 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import QtWayland.Compositor 1.0 + +WaylandCompositor { + id: wlcompositor + + WaylandOutput { + compositor: wlcompositor + window: Window { + id: topSurfaceArea + width: 1024 + height: 768 + visible: true + color: "#1337af" + Text { text: "Top screen" } + } + } + + WaylandOutput { + compositor: wlcompositor + window: Window { + id: bottomSurfaceArea + width: 1024 + height: 768 + visible: true + color: "#1abacc" + Text { text: "Bottom screen" } + } + } + + Component { + id: chromeComponent + WaylandQuickItem { + onSurfaceDestroyed: destroy() + } + } + + Component { + id: xdgPopupComponent + ShellSurfaceItem { + onSurfaceDestroyed: destroy() + } + } + + WlShell { + onWlShellSurfaceCreated: handleShellSurfaceCreated(shellSurface) + } + + property variant viewsBySurface: ({}) + + XdgShellV5 { + onXdgSurfaceCreated: handleShellSurfaceCreated(xdgSurface) + onXdgPopupCreated: { + var parentViews = viewsBySurface[xdgPopup.parentSurface]; + xdgPopupComponent.createObject(parentViews.top, { "shellSurface": xdgPopup } ); + xdgPopupComponent.createObject(parentViews.bottom, { "shellSurface": xdgPopup } ); + } + } + + function handleShellSurfaceCreated(shellSurface) { + var topItem = chromeComponent.createObject(topSurfaceArea, { + "surface": shellSurface.surface + }); + + var bottomItem = chromeComponent.createObject(bottomSurfaceArea, { + "surface": shellSurface.surface, + "y": Qt.binding(function() { return -topSurfaceArea.height;}) + }); + + viewsBySurface[shellSurface.surface] = { + top: topItem, + bottom: bottomItem + }; + + var height = bottomSurfaceArea.height + topSurfaceArea.height; + var width = Math.max(bottomSurfaceArea.width, topSurfaceArea.width); + var size = Qt.size(width, height); + + if (shellSurface.sendFullscreen) { + shellSurface.sendFullscreen(size); + } else if (shellSurface.sendConfigure) { + shellSurface.sendConfigure(size, WlShellSurface.NoneEdge); + } + } +} diff --git a/examples/wayland/spanning-screens/spanning-screens.pro b/examples/wayland/spanning-screens/spanning-screens.pro new file mode 100644 index 000000000..266c976ac --- /dev/null +++ b/examples/wayland/spanning-screens/spanning-screens.pro @@ -0,0 +1,14 @@ +QT += gui qml + +SOURCES += \ + main.cpp + +OTHER_FILES = \ + main.qml + +RESOURCES += spanning-screens.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/spanning-screens +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spanning-screens.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/spanning-screens +INSTALLS += target sources diff --git a/examples/wayland/spanning-screens/spanning-screens.qrc b/examples/wayland/spanning-screens/spanning-screens.qrc new file mode 100644 index 000000000..5f6483ac3 --- /dev/null +++ b/examples/wayland/spanning-screens/spanning-screens.qrc @@ -0,0 +1,5 @@ + + + main.qml + + diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index d4b631403..d8f7eaab6 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro @@ -7,6 +7,7 @@ contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengl):qtHaveModule(quick) { SUBDIRS += minimal-qml + SUBDIRS += spanning-screens SUBDIRS += pure-qml SUBDIRS += multi-output SUBDIRS += custom-extension -- cgit v1.2.3