diff options
author | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2015-08-11 18:14:02 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-09-01 20:15:23 +0000 |
commit | 678d3de4b53f22ead68a0874df2892137ad3b7f7 (patch) | |
tree | 3668f51e1f0c9490433e1084b96693958731931d /tests/manual/pointer | |
parent | 149911b0f45fbe1d1a4766a0bb0c9b7c3b54366d (diff) |
Introduce PinchHandler
Similar to PinchArea but with improvements:
- Allows rotating and scaling about an arbitrary point rather than the center
- It's possible to require more than 2 fingers. E.g. maybe you use
3 fingers to manage a window, 2 fingers to manipulate content inside.
This could be achieved with two independent PinchHandlers.
Change-Id: Ifd40cfee115d7bc298378b26a58318bea40a8230
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Diffstat (limited to 'tests/manual/pointer')
-rw-r--r-- | tests/manual/pointer/main.qml | 1 | ||||
-rw-r--r-- | tests/manual/pointer/pinchHandler.qml | 93 | ||||
-rw-r--r-- | tests/manual/pointer/qml.qrc | 2 |
3 files changed, 95 insertions, 1 deletions
diff --git a/tests/manual/pointer/main.qml b/tests/manual/pointer/main.qml index efe603c57f..45a339b302 100644 --- a/tests/manual/pointer/main.qml +++ b/tests/manual/pointer/main.qml @@ -52,6 +52,7 @@ Window { Component.onCompleted: { addExample("joystick", "DragHandler: move one item inside another with any pointing device", Qt.resolvedUrl("joystick.qml")) addExample("mixer", "mixing console", Qt.resolvedUrl("mixer.qml")) + addExample("pinch", "PinchHandler: scale, rotate and drag", Qt.resolvedUrl("pinchHandler.qml")) } } } diff --git a/tests/manual/pointer/pinchHandler.qml b/tests/manual/pointer/pinchHandler.qml new file mode 100644 index 0000000000..e4482a249d --- /dev/null +++ b/tests/manual/pointer/pinchHandler.qml @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the manual tests 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.8 +import Qt.labs.handlers 1.0 + +Rectangle { + id: root + width: 1024; height: 600 + color: "black" + + Rectangle { + width: 400 + height: 300 + color: "lightsteelblue" + antialiasing: true + + Text { + anchors.centerIn: parent + text: "Pinch with 2 fingers to scale & rotate\nDrag with 1 finger\ncurrent rotation " + pinch2.rotation.toFixed(1) + } + + DragHandler { objectName: "DragHandler" } + + PinchHandler { + id: pinch2 + objectName: "2-finger pinch" + minimumRotation: -45 + maximumRotation: 45 + minimumScale: 0.1 + maximumScale: 10 + pointDistanceThreshold: 150 + } + } + + Rectangle { + x: 512 + width: 400 + height: 300 + color: "wheat" + antialiasing: true + + Text { + anchors.centerIn: parent + text: "Pinch with 3 fingers to scale & rotate\ncurrent rotation " + pinch3.rotation.toFixed(1) + } + + PinchHandler { + id: pinch3 + objectName: "3-finger pinch" + requiredPointCount: 3 + minimumScale: 0.1 + maximumScale: 10 + } + } +} diff --git a/tests/manual/pointer/qml.qrc b/tests/manual/pointer/qml.qrc index b802a73f08..dac6b08b12 100644 --- a/tests/manual/pointer/qml.qrc +++ b/tests/manual/pointer/qml.qrc @@ -2,8 +2,8 @@ <qresource prefix="/"> <file>main.qml</file> <file>joystick.qml</file> - <file>main.qml</file> <file>mixer.qml</file> + <file>pinchHandler.qml</file> <file>content/Slider.qml</file> <file>resources/mixer-knob.png</file> <file>resources/redball.png</file> |