diff options
author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-02-26 13:10:36 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2016-04-26 12:29:04 +0000 |
commit | b04a737dc694064b4fd507f0f52a7b9537c09bc7 (patch) | |
tree | 335d18f572926e082affb7d9e682b7feb3502144 /examples | |
parent | 38cdbabc0fe92a105ac6f6accaa6e75a6d730e56 (diff) |
QML API for xdg-shell
Exposes QWaylandXdgShell and QWaylandXdgSurface as QML types, along with
a new QWaylandXdgSurfaceItem.
All of this mirrors the implementation of wl_shell closely. The biggest
difference is how resize is handled.
There is now some duplication in the window chrome implementation of the
pure-qml compositor. This may be improved by refactoring the existing
API for shell extensions.
Change-Id: I4f2ceff7e0462034cd295a27c3eefea457cc9b96
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/wayland/pure-qml/pure-qml.pro | 1 | ||||
-rw-r--r-- | examples/wayland/pure-qml/pure-qml.qrc | 1 | ||||
-rw-r--r-- | examples/wayland/pure-qml/qml/XdgChrome.qml | 90 | ||||
-rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 17 |
4 files changed, 109 insertions, 0 deletions
diff --git a/examples/wayland/pure-qml/pure-qml.pro b/examples/wayland/pure-qml/pure-qml.pro index 20fc529ed..f0a10260a 100644 --- a/examples/wayland/pure-qml/pure-qml.pro +++ b/examples/wayland/pure-qml/pure-qml.pro @@ -8,6 +8,7 @@ OTHER_FILES = \ qml/Screen.qml \ qml/Chrome.qml \ qml/Keyboard.qml \ + qml/XdgChrome.qml \ images/background.jpg \ RESOURCES += pure-qml.qrc diff --git a/examples/wayland/pure-qml/pure-qml.qrc b/examples/wayland/pure-qml/pure-qml.qrc index 8c95434d3..333f5e613 100644 --- a/examples/wayland/pure-qml/pure-qml.qrc +++ b/examples/wayland/pure-qml/pure-qml.qrc @@ -5,5 +5,6 @@ <file>qml/Screen.qml</file> <file>qml/Chrome.qml</file> <file>qml/Keyboard.qml</file> + <file>qml/XdgChrome.qml</file> </qresource> </RCC> diff --git a/examples/wayland/pure-qml/qml/XdgChrome.qml b/examples/wayland/pure-qml/qml/XdgChrome.qml new file mode 100644 index 000000000..afe137c68 --- /dev/null +++ b/examples/wayland/pure-qml/qml/XdgChrome.qml @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** 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.0 +import QtWayland.Compositor 1.0 + +XdgSurfaceItem { + id: rootChrome + + xdgSurface: XdgSurface { + id: xdgSurface + onActivatedChanged: { + if (xdgSurface.activated) { + receivedFocusAnimation.start(); + } + } + } + + onSurfaceDestroyed: { + view.bufferLock = true; + destroyAnimation.start(); + } + + SequentialAnimation { + id: receivedFocusAnimation + ParallelAnimation { + NumberAnimation { target: scaleTransform; property: "yScale"; to: 1.02; duration: 100; easing.type: Easing.OutQuad } + NumberAnimation { target: scaleTransform; property: "xScale"; to: 1.02; duration: 100; easing.type: Easing.OutQuad } + } + ParallelAnimation { + NumberAnimation { target: scaleTransform; property: "yScale"; to: 1; duration: 100; easing.type: Easing.InOutQuad } + NumberAnimation { target: scaleTransform; property: "xScale"; to: 1; duration: 100; easing.type: Easing.InOutQuad } + } + } + + SequentialAnimation { + id: destroyAnimation + ParallelAnimation { + NumberAnimation { target: scaleTransform; property: "yScale"; to: 2/height; duration: 150 } + NumberAnimation { target: scaleTransform; property: "xScale"; to: 0.4; duration: 150 } + } + NumberAnimation { target: scaleTransform; property: "xScale"; to: 0; duration: 150 } + ScriptAction { script: { rootChrome.destroy(); } } + } + + transform: [ + Scale { + id: scaleTransform + origin.x: rootChrome.width / 2 + origin.y: rootChrome.height / 2 + } + ] +} diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index ac8dde712..65ac36166 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -57,6 +57,12 @@ WaylandCompositor { } Component { + id: xdgChromeComponent + XdgChrome { + } + } + + Component { id: surfaceComponent WaylandSurface { } @@ -82,6 +88,17 @@ WaylandCompositor { initialize(); } }, + XdgShell { + id: xdgShell + + onXdgSurfaceCreated: { + xdgChromeComponent.createObject(defaultOutput.surfaceArea, { "xdgSurface": xdgSurface } ); + } + + Component.onCompleted: { + initialize(); + } + }, TextInputManager { Component.onCompleted: { initialize(); |