diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-11-20 16:01:20 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-01-22 21:38:36 +0000 |
commit | 8380e4c4a4f3f49a74a8bc0ff330e1c9e14dbafc (patch) | |
tree | f7d19139cef728185a094d73f349be6a46e21997 /tests/manual | |
parent | 84a1cac0baf2e089989ef1cba31437e7c3917d95 (diff) |
Add handlers declared as Flickable children to its contentItem
QQuickItemPrivate::data_append() was not invoked when any kind of
Pointer Handler was directly declared in a Flickable (or subclass)
because QQuickFlickable redefines the default property to be its own
flickableData property. So we need to repeat the special handling
in QQuickFlickablePrivate::data_append() too. The handler must
be added to the private->extra->pointerHandlers vector, so that
QQuickItemPrivate::handlePointerEvent() will attempt to deliver
events to those handlers.
TapHandler seems OK (especially with its default gesturePolicy
so that it does not do an exclusive grab).
PointHandler seems OK.
DragHandler competes with Flickable for the exclusive grab.
pressDelay can help; or set acceptedDevices: PointerDevice.Mouse
to allow the mouse to drag but not flick, and the touchscreen
to flick but not drag.
Fixes: QTBUG-71918
Fixes: QTBUG-73035
Change-Id: Icb97ed5230abe0cb6ec0230b5b5759a0528df7e8
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/pointer/pointHandlerOnFlickable.qml | 74 | ||||
-rw-r--r-- | tests/manual/pointer/rubberbandOnTable.qml | 86 |
2 files changed, 160 insertions, 0 deletions
diff --git a/tests/manual/pointer/pointHandlerOnFlickable.qml b/tests/manual/pointer/pointHandlerOnFlickable.qml new file mode 100644 index 0000000000..bd39d545ca --- /dev/null +++ b/tests/manual/pointer/pointHandlerOnFlickable.qml @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 +import "content" + +Flickable { + id: root + objectName: "root" + width: 800 + height: 480 + contentWidth: 1000 + contentHeight: 600 + + Rectangle { + objectName: "button" + anchors.centerIn: parent + border.color: "tomato" + border.width: 10 + color: innerTap.pressed ? "wheat" : "transparent" + width: 100 + height: 100 + TapHandler { + id: innerTap + objectName: "buttonTap" + } + } + + TapHandler { + id: contentItemTap + objectName: "contentItemTap" + onLongPressed: longPressFeedback.createObject(root.contentItem, + {"x": point.position.x, "y": point.position.y, + "text": contentItemTap.timeHeld.toFixed(3) + " sec"}) + + } + TouchpointFeedbackSprite { } + TouchpointFeedbackSprite { } + TouchpointFeedbackSprite { } + TouchpointFeedbackSprite { } + TouchpointFeedbackSprite { } + + Component { + id: longPressFeedback + Text { } + } + + Component.onCompleted: contentItem.objectName = "Flickable's contentItem" +} diff --git a/tests/manual/pointer/rubberbandOnTable.qml b/tests/manual/pointer/rubberbandOnTable.qml new file mode 100644 index 0000000000..177568d41e --- /dev/null +++ b/tests/manual/pointer/rubberbandOnTable.qml @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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:GPL-EXCEPT$ +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 + +TableView { + id: root + objectName: "root" + width: 480 + height: 480 + columnSpacing: 2 + rowSpacing: 2 + // TODO use TableModel when it's ready, to test with multiple columns + model: 10 + + delegate: Rectangle { + id: tableDelegate + objectName: "itemview delegate" + color: delegateTap.pressed ? "wheat" : "beige" + implicitWidth: 200 + implicitHeight: 140 + + Rectangle { + objectName: "button" + anchors.centerIn: parent + border.color: "tomato" + border.width: 10 + color: buttonTap.pressed ? "goldenrod" : "beige" + width: 100 + height: 100 + TapHandler { + id: buttonTap + objectName: "buttonTap" + } + } + + TapHandler { + id: delegateTap + objectName: "delegateTap" + } + } + + DragHandler { + id: rubberBandDrag + objectName: "rubberBandDrag" + target: null + acceptedDevices: PointerDevice.Mouse + } + Rectangle { + visible: rubberBandDrag.active + x: Math.min(rubberBandDrag.centroid.position.x, rubberBandDrag.centroid.pressPosition.x) + y: Math.min(rubberBandDrag.centroid.position.y, rubberBandDrag.centroid.pressPosition.y) + width: Math.abs(rubberBandDrag.centroid.position.x - rubberBandDrag.centroid.pressPosition.x) + height: Math.abs(rubberBandDrag.centroid.position.y - rubberBandDrag.centroid.pressPosition.y) + color: "transparent" + border.color: "black" + z: 1000 + } + + Component.onCompleted: contentItem.objectName = "TableView's contentItem" +} |