From 95d6fbc30b180018a6f6d9a69d31b03223608e22 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 19 Jan 2015 19:48:23 +0100 Subject: Move SourceProxy to C++ and introduce "private" module. This gives us a bit better control in terms of what we want to check for. It should also fix some subtle bugs when layer and ShaderEffectSource is used as input. Change-Id: I29de13598811623c31563ac6e88f070aee0bab54 Task-number: QTBUG-40849 Reviewed-by: Lars Knoll Reviewed-by: Laszlo Agocs --- tests/manual/SourceProxyTest.qml | 110 ++++++++++++++++++ tests/manual/testSourceProxy.qml | 245 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 355 insertions(+) create mode 100644 tests/manual/SourceProxyTest.qml create mode 100644 tests/manual/testSourceProxy.qml (limited to 'tests') diff --git a/tests/manual/SourceProxyTest.qml b/tests/manual/SourceProxyTest.qml new file mode 100644 index 0000000..e68bc35 --- /dev/null +++ b/tests/manual/SourceProxyTest.qml @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Jolla Ltd, author: +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Graphical Effects module. +** +** $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 QtGraphicalEffects.private 1.0 +import QtQuick 2.4 + +Rectangle { + + Rectangle { + width: parent.width + height: 1 + color: "lightsteelblue" + } + + id: root + + height: 40 + width: parent.width + + property alias proxyInterpolation: proxy.interpolation + property bool proxyPadding: false + + property string sourcing; // "layered", "shadersource", "none"; + + property bool smoothness: true + property bool padding: false + + property alias label: text.text + + + property bool expectProxy: false + + color: proxy.active ? "darkred" : "darkblue" + + Text { + id: text + color: "white" + font.pixelSize: 14 + font.bold: true + + anchors.centerIn: parent + + layer.enabled: root.sourcing == "layered" + layer.smooth: root.smoothness + layer.sourceRect: padding ? Qt.rect(-1, -1, text.width, text.height) : Qt.rect(0, 0, 0, 0); + } + + ShaderEffectSource { + id: shaderSource + sourceItem: text + smooth: root.smoothness + sourceRect: padding ? Qt.rect(-1, -1, text.width, text.height) : Qt.rect(0, 0, 0, 0); + } + + SourceProxy { + id: proxy + input: sourcing == "shadersource" ? shaderSource : text; + visible: false + sourceRect: proxyPadding ? Qt.rect(-1, -1, text.width, text.height) : Qt.rect(0, 0, 0, 0); + } + + Text { + color: "red" + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter; + rotation: 45 + text: "FAIL" + font.pixelSize: 12 + font.bold: true + visible: root.expectProxy != proxy.active + } + +} diff --git a/tests/manual/testSourceProxy.qml b/tests/manual/testSourceProxy.qml new file mode 100644 index 0000000..1ca3f95 --- /dev/null +++ b/tests/manual/testSourceProxy.qml @@ -0,0 +1,245 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Jolla Ltd, author: +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Graphical Effects module. +** +** $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 QtGraphicalEffects.private 1.0 +import QtQuick 2.4; + +Item { + id: root + + width: 400 + height: 600 + + // Text { + // text: "source: layered, padded\nproxy: expect-no-padding" + // layer.enabled: true + // layer.sourceRect: Qt.rect(-1, -1, width, height); + // font.pixelSize: 14 + // font.bold: true + // } + + Flickable { + + anchors.fill: parent + + contentWidth: root.width + contentHeight: column.height + + Column { + id: column + width: root.width + + SourceProxyTest { + label: "source: layered, padded\nproxy: expect-no-padding" + sourcing: "layered" + proxyPadding: false + padding: true + expectProxy: true + } + SourceProxyTest { + label: "source: layered, non-padded\nproxy: expect-no-padding" + sourcing: "layered" + proxyPadding: false + padding: false + expectProxy: false + } + SourceProxyTest { + label: "source: layered, padded\nproxy: expect-padding" + sourcing: "layered" + proxyPadding: true + padding: true + expectProxy: false + } + SourceProxyTest { + label: "source: layered, non-padded\nproxy: expect-padding" + sourcing: "layered" + proxyPadding: true + padding: false + expectProxy: true + } + + + SourceProxyTest { + label: "source: shadersource, padded\nproxy: expect-no-padding" + sourcing: "shadersource" + proxyPadding: false + padding: true + expectProxy: true + } + SourceProxyTest { + label: "source: shadersource, non-padded\nproxy: expect-no-padding" + sourcing: "shadersource" + proxyPadding: false + padding: false + expectProxy: false + } + SourceProxyTest { + label: "source: shadersource, padded\nproxy: expect-padding" + sourcing: "shadersource" + proxyPadding: true + padding: true + expectProxy: false + } + SourceProxyTest { + label: "source: shadersource, non-padded\nproxy: expect-padding" + sourcing: "shadersource" + proxyPadding: true + padding: false + expectProxy: true + } + + + SourceProxyTest { + label: "source: layered, non-smooth\nproxy: any-interpolation, " + sourcing: "layered" + smoothness: false + proxyInterpolation: SourceProxy.AnyInterpolation + expectProxy: false + } + SourceProxyTest { + label: "source: layered, smooth\nproxy: any-interpolation, " + sourcing: "layered" + smoothness: true + proxyInterpolation: SourceProxy.AnyInterpolation + expectProxy: false + } + SourceProxyTest { + label: "source: layered, non-smooth\nproxy: nearest-interpolation, " + sourcing: "layered" + smoothness: false + proxyInterpolation: SourceProxy.NearestInterpolation + expectProxy: false + } + SourceProxyTest { + label: "source: layered, smooth\nproxy: nearest-interpolation, " + sourcing: "layered" + smoothness: true + proxyInterpolation: SourceProxy.NearestInterpolation + expectProxy: true + } + + SourceProxyTest { + label: "source: layered, non-smooth\nproxy: linear-interpolation, " + sourcing: "layered" + smoothness: false + proxyInterpolation: SourceProxy.LinearInterpolation + expectProxy: true + } + SourceProxyTest { + label: "source: layered, smooth\nproxy: linear-interpolation, " + sourcing: "layered" + smoothness: true + proxyInterpolation: SourceProxy.LinearInterpolation + expectProxy: false + } + + + + SourceProxyTest { + label: "source: shadersource, non-smooth\nproxy: any-interpolation, " + sourcing: "shadersource" + smoothness: false + proxyInterpolation: SourceProxy.AnyInterpolation + expectProxy: false + } + SourceProxyTest { + label: "source: shadersource, smooth\nproxy: any-interpolation, " + sourcing: "shadersource" + smoothness: true + proxyInterpolation: SourceProxy.AnyInterpolation + expectProxy: false + } + + SourceProxyTest { + label: "source: shadersource, non-smooth\nproxy: nearest-interpolation, " + sourcing: "shadersource" + smoothness: false + proxyInterpolation: SourceProxy.NearestInterpolation + expectProxy: false + } + SourceProxyTest { + label: "source: shadersource, smooth\nproxy: nearest-interpolation, " + sourcing: "shadersource" + smoothness: true + proxyInterpolation: SourceProxy.NearestInterpolation + expectProxy: true + } + + SourceProxyTest { + label: "source: shadersource, non-smooth\nproxy: linear-interpolation, " + sourcing: "shadersource" + smoothness: false + proxyInterpolation: SourceProxy.LinearInterpolation + expectProxy: true + } + SourceProxyTest { + label: "source: shadersource, smooth\nproxy: linear-interpolation, " + sourcing: "shadersource" + smoothness: true + proxyInterpolation: SourceProxy.LinearInterpolation + expectProxy: false + } + + + + SourceProxyTest { + label: "source: none\nproxy: any-interpolation" + sourcing: "none" + proxyInterpolation: SourceProxy.AnyInterpolation + expectProxy: true + } + SourceProxyTest { + label: "source: none\nproxy: nearest-interpolation" + sourcing: "none" + proxyInterpolation: SourceProxy.NearestInterpolation + expectProxy: true + } + SourceProxyTest { + label: "source: none\nproxy: linear-interpolation" + sourcing: "none" + proxyInterpolation: SourceProxy.LinearInterpolation + expectProxy: true + } + + + } + + } +} -- cgit v1.2.3