summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2016-01-11 15:08:57 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2016-01-12 11:46:48 +0000
commit05f3a58e72f012a15d083f1a05a46709fd7b1b9f (patch)
tree8f7741400165ff485508f4f5de916ed843465552 /examples
parentf7be841e43dde6af1194c370c6a50b0167dd89f4 (diff)
Fix cellphone example flicking
Apparently Flickable has changed internally so that giving two flick commands with same parameters in a row results in no flicking done at all. Fixed the example so that we only ever send one flick. Change-Id: I3ebd514e7958a86b918735df57612984fab6c8fa Task-number: QTBUG-50393 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml8
1 files changed, 3 insertions, 5 deletions
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml b/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml
index 6af000c..7dcd7a8 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml
+++ b/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml
@@ -300,14 +300,12 @@ Rectangle {
flickDeceleration: 0
onMovementStarted: {
// Interpret all drags as flicks instead
- if (interactive)
+ if (interactive) {
+ interactive = false
flick(-flickSpeed, 0)
- interactive = false
+ }
}
onFlickStarted: {
- // All flicks will open the screen at consistent speed
- if (interactive)
- flick(-flickSpeed, 0)
interactive = false
}
onFlickEnded: {