aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickflickable/data/nested.qml
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2021-01-14 18:27:14 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-15 09:46:09 +0000
commit0c3866a5ba406fe7d04ec19cbf8378e9b0150fb0 (patch)
tree0fbc020e7f77a5f776e8430d44b3a3e8d69d66b3 /tests/auto/quick/qquickflickable/data/nested.qml
parent367a781854ff4d4bcc0fb84c2d45278e92a7369e (diff)
Flickable: ignore trackpad events with px deltas in disallowed direction
If Flickable.flickDirection == HorizontalFlick, then if the accumulated QWheelEvent::pixelDelta()'s abs(dx) > 2 * abs(dy), clearly the user is trying to scroll horizontally; otherwise, don't accept the event. That way the event is allowed to propagate to a parent Flickable that does allow flicking vertically. Likewise if the nesting is the other way around, only allow the inner vertical Flickable to accept if the flicking is actually vertical. Fixes: QTBUG-57245 Fixes: QTBUG-80236 Change-Id: Ieb0bf9310a67210ce7e9fe7a80c88baef2cc7ede Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit dccd8f0b5ca8f6faefb49718e33f9090243f3202) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/quick/qquickflickable/data/nested.qml')
-rw-r--r--tests/auto/quick/qquickflickable/data/nested.qml52
1 files changed, 52 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickflickable/data/nested.qml b/tests/auto/quick/qquickflickable/data/nested.qml
new file mode 100644
index 0000000000..c306bfab23
--- /dev/null
+++ b/tests/auto/quick/qquickflickable/data/nested.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 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
+
+Flickable {
+ id: root
+ objectName: "root flickable"
+ width: 240; height: 240
+ contentHeight: 1000
+
+ Flickable {
+ flickableDirection: Flickable.HorizontalFlick
+ width: root.width
+ height: 100
+ contentWidth: 1000
+ objectName: "inner flickable"
+ Repeater {
+ model: 10
+ Rectangle {
+ x: 100 * index
+ width: 96
+ height: 96
+ color: Qt.rgba(Math.random(), Math.random(), Math.random(), Math.random())
+ }
+ }
+ }
+}