From 4e7af898b28fa8995582a4c0df0455a575525911 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 7 Dec 2016 11:52:55 +0100 Subject: Add support for running compositors with custom device pixel ratio And add a manual test for showing that it works with different scale factors as well. Task-number: QTBUG-55303 Change-Id: Ib842ea51cfb62a2d46713e95d56b8a9da445d14d Reviewed-by: Paul Olav Tvete Reviewed-by: Pier Luigi Fiorini --- tests/manual/scaling-compositor/main.cpp | 49 +++++++++++++ tests/manual/scaling-compositor/main.qml | 84 ++++++++++++++++++++++ tests/manual/scaling-compositor/qml.qrc | 5 ++ .../scaling-compositor/scaling-compositor.pro | 7 ++ 4 files changed, 145 insertions(+) create mode 100644 tests/manual/scaling-compositor/main.cpp create mode 100644 tests/manual/scaling-compositor/main.qml create mode 100644 tests/manual/scaling-compositor/qml.qrc create mode 100644 tests/manual/scaling-compositor/scaling-compositor.pro (limited to 'tests/manual') diff --git a/tests/manual/scaling-compositor/main.cpp b/tests/manual/scaling-compositor/main.cpp new file mode 100644 index 000000000..33ffb0386 --- /dev/null +++ b/tests/manual/scaling-compositor/main.cpp @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** 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 + +int main(int argc, char* argv[]) +{ + QGuiApplication app(argc, argv); + QQmlApplicationEngine engine(QUrl("qrc:/main.qml")); + return app.exec(); +} diff --git a/tests/manual/scaling-compositor/main.qml b/tests/manual/scaling-compositor/main.qml new file mode 100644 index 000000000..e017a44f6 --- /dev/null +++ b/tests/manual/scaling-compositor/main.qml @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** 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.2 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.0 +import QtWayland.Compositor 1.0 + +WaylandCompositor { + id: comp + WaylandOutput { + id: output + compositor: comp + sizeFollowsWindow: true + scaleFactor: 2 + window: Window { + id: win + width: 500 + height: 500 + visible: true + title: "Scaling compositor x" + output.scaleFactor + Button { + id: incrementButton + text: "+" + onClicked: ++output.scaleFactor + } + Button { + text: "-" + onClicked: output.scaleFactor = Math.max(1, output.scaleFactor - 1) + anchors.left: incrementButton.right + } + Repeater { + model: shellSurfaces + ShellSurfaceItem { + shellSurface: modelData + onSurfaceDestroyed: shellSurfaces.remove(index); + } + } + } + } + + ListModel { id: shellSurfaces } + + WlShell { + onWlShellSurfaceCreated: shellSurfaces.append({shellSurface: shellSurface}); + } +} diff --git a/tests/manual/scaling-compositor/qml.qrc b/tests/manual/scaling-compositor/qml.qrc new file mode 100644 index 000000000..6b2d0a781 --- /dev/null +++ b/tests/manual/scaling-compositor/qml.qrc @@ -0,0 +1,5 @@ + + + main.qml + + diff --git a/tests/manual/scaling-compositor/scaling-compositor.pro b/tests/manual/scaling-compositor/scaling-compositor.pro new file mode 100644 index 000000000..847e07ea7 --- /dev/null +++ b/tests/manual/scaling-compositor/scaling-compositor.pro @@ -0,0 +1,7 @@ +TEMPLATE = app + +QT += gui qml quickcontrols2 + +SOURCES += main.cpp + +RESOURCES += qml.qrc -- cgit v1.2.3