aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickflickable/data
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den.exter@jollamobile.com>2015-09-28 17:57:51 +1000
committerAndrew den Exter <andrew.den.exter@qinetic.com.au>2015-10-12 05:58:57 +0000
commitc95fbaf3698b5766e16aa1685136b539ab56a8c4 (patch)
tree754133f9f35728a253e82f1b53962892201c1f76 /tests/auto/quick/qquickflickable/data
parent8e7d1a91196197eee4e45bbfa9886ab935e2b67c (diff)
Don't send delayed mouse presses to ancestors of the replaying Flickable.
If a Flickable delayed a mouse press event and then replayed it later, ancestor items of that Flickable would receive the press twice: once when filtering events of the Flickable, and again when the event was replayed to a descendent of the Flickable. Extend the protection against a Flickable receiving that repeat event to all ancestor items so this doesn't happen. Change-Id: I438c146130c24a7d47e9e8712a1ab08f3d915a06 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
Diffstat (limited to 'tests/auto/quick/qquickflickable/data')
-rw-r--r--tests/auto/quick/qquickflickable/data/nestedPressDelay.qml10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickflickable/data/nestedPressDelay.qml b/tests/auto/quick/qquickflickable/data/nestedPressDelay.qml
index 742656641f..bdb866ce65 100644
--- a/tests/auto/quick/qquickflickable/data/nestedPressDelay.qml
+++ b/tests/auto/quick/qquickflickable/data/nestedPressDelay.qml
@@ -8,12 +8,18 @@ Flickable {
contentHeight: 320
flickableDirection: Flickable.HorizontalFlick
pressDelay: 10000
- Rectangle {
+ MouseArea {
+ objectName: "filteringMouseArea"
x: 20
y: 20
width: 400
height: 300
- color: "yellow"
+ drag.filterChildren: true
+ Rectangle {
+ id: rectangle
+ color: "yellow"
+ anchors.fill: parent
+ }
Flickable {
objectName: "innerFlickable"
anchors.fill: parent