diff options
author | Alberto Mardegan <mardy@users.sourceforge.net> | 2016-11-21 22:41:33 +0300 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2017-11-03 08:27:36 +0000 |
commit | 62b1bc426929c5f990f00bee7d3de8a0024ed7c5 (patch) | |
tree | 3eebddcda96a528f5b1a7b4e52953d67c0413ce5 /tests/auto/quick/qquickgridview/data/qtbug57225.qml | |
parent | a7880a0c92323ccb2f297a39a993a87e20d65e9c (diff) |
QQuickItemView: always honor the removeDisplaced animation
The animation was not being performed if the delayRemove attached
property was changed by the handler of the remove() attached signal.
We need to run the delayed transitions not only if we have an animation
for the target item, but also if we have an animation for the items
being displaced.
(The flag variables can safely be obtained outside of the for loop,
given that their value should not change during the loop iteration)
Task-number: QTBUG-57225
Change-Id: I8c138677d7dcdf63e0932ec5cf7738c0caeb2ab8
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickgridview/data/qtbug57225.qml')
-rw-r--r-- | tests/auto/quick/qquickgridview/data/qtbug57225.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickgridview/data/qtbug57225.qml b/tests/auto/quick/qquickgridview/data/qtbug57225.qml index 7f5e67822c..3871e5d273 100644 --- a/tests/auto/quick/qquickgridview/data/qtbug57225.qml +++ b/tests/auto/quick/qquickgridview/data/qtbug57225.qml @@ -52,6 +52,7 @@ Rectangle { GridView { id: grid + property int displaceTransitionsDone: 0 property bool animationDone: false property point minimumPosition: Qt.point(0, 0) @@ -73,8 +74,8 @@ Rectangle { properties: "x,y" duration: root.duration easing.type: Easing.OutBounce - easing.amplitude: 10.0 // longer-lasting bounce to trigger bug } + ScriptAction { script: grid.displaceTransitionsDone += 1 } } } |