From 2cba55f755c4323b42d138bd5f6fde13ac294bad Mon Sep 17 00:00:00 2001
From: Felix Gerking <felix.gerking@garz-fricke.com>
Date: Wed, 11 May 2022 11:45:06 +0200
Subject: [PATCH] dual-espresso: Add IviShell handling
BCS 746-000666
---
multi-screen.pro | 1 +
multi-screen.qrc | 1 +
qml/IviChrome.qml | 73 +++++++++++++++++++++++++++++++++++++++++++++++
qml/main.qml | 23 +++++++++++++++
4 files changed, 98 insertions(+)
create mode 100644 qml/IviChrome.qml
diff --git a/multi-screen.pro b/multi-screen.pro
index 29e1479..ac9bc51 100644
--- a/multi-screen.pro
+++ b/multi-screen.pro
@@ -16,3 +16,4 @@ INSTALLS += target sources
DISTFILES += \
qml/Screen.qml \
qml/Chrome.qml
+ qml/IviChrome.qml
diff --git a/multi-screen.qrc b/multi-screen.qrc
index 57fcd3c..d035221 100644
--- a/multi-screen.qrc
+++ b/multi-screen.qrc
@@ -3,5 +3,6 @@
<file>qml/main.qml</file>
<file>qml/Screen.qml</file>
<file>qml/Chrome.qml</file>
+ <file>qml/IviChrome.qml</file>
</qresource>
</RCC>
diff --git a/qml/IviChrome.qml b/qml/IviChrome.qml
new file mode 100644
index 0000000..832c897
--- /dev/null
+++ b/qml/IviChrome.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, 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.0
+import QtWayland.Compositor 1.0
+
+Item {
+ id: chrome
+ property alias shellSurface: surfaceItem.shellSurface
+ property alias surfaceItem: surfaceItem
+ anchors.fill: parent
+
+ onWidthChanged: handleResized()
+ onHeightChanged: handleResized()
+
+ ShellSurfaceItem {
+ id: surfaceItem
+ anchors.fill: parent
+ autoCreatePopupItems: true
+ onSurfaceDestroyed: chrome.destroy();
+ }
+ function handleResized() {
+ shellSurface.sendConfigure(Qt.size(width, height));
+ }
+}
diff --git a/qml/main.qml b/qml/main.qml
index 2c75c97..37ec653 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -78,6 +78,11 @@ WaylandCompositor {
Chrome {}
}
+ Component {
+ id: iviChromeComponent
+ IviChrome {}
+ }
+
Component {
id: moveItemComponent
Item {}
@@ -99,6 +104,10 @@ WaylandCompositor {
onToplevelCreated: handleShellSurfaceCreated(xdgSurface)
}
+ IviApplication {
+ onIviSurfaceCreated: handleIviSurfaceCreated(iviSurface)
+ }
+
function createShellSurfaceItem(shellSurface, output) {
var item = chromeComponent.createObject(output.surfaceArea, {
"shellSurface": shellSurface,
@@ -112,4 +121,18 @@ WaylandCompositor {
current_screen++;
createShellSurfaceItem(shellSurface, screens.objectAt(current_screen));
}
+
+ function createIviSurfaceItem(iviSurface, output) {
+ var item = iviChromeComponent.createObject(output.surfaceArea, {
+ "shellSurface": iviSurface,
+ });
+ }
+
+ function handleIviSurfaceCreated(iviSurface) {
+ if (current_screen+1 > screens.count-1)
+ current_screen = 0;
+ else
+ current_screen++;
+ createIviSurfaceItem(iviSurface, screens.objectAt(current_screen));
+ }
}
--
GitLab