diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-09-02 14:26:37 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-09-06 12:42:24 +0000 |
| commit | acbeb01a785582b6654c0bf21b06b6673d269d76 (patch) | |
| tree | 08eb01168cd43ee93d27c89d6b7ab2c0a0bcb2fd /examples | |
| parent | a04083615e23d4951b20554f421206c5d46d9872 (diff) | |
Fix cellphone example flicking
Task-number: QTBUG-50393
Change-Id: I3da3fede43ede5e8d4a942e0c4df4e83117ca4cc
Reviewed-by: Sami Makkonen <sami.makkonen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml index 9ab674d..0dae2b7 100644 --- a/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml +++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml @@ -205,7 +205,7 @@ Rectangle { model: appGridModel cellWidth: width / 3 cellHeight: cellWidth - interactive: false + boundsBehavior: Flickable.StopAtBounds delegate: Component { id: appGridDelegate Item { @@ -311,21 +311,18 @@ Rectangle { contentHeight: clock.height contentX: 0 boundsBehavior: Flickable.StopAtBounds - flickDeceleration: 0 - onMovementStarted: { - // Interpret all drags as flicks instead - if (interactive) { - interactive = false + flickableDirection: Flickable.HorizontalFlick + flickDeceleration: 0.1 + onMovementEnded: { + if (contentX == width) { + visible = false + mainScreen.resetLockTimer() + } else if (contentX != 0) { flick(-flickSpeed, 0) } } - onFlickStarted: { - interactive = false - } onFlickEnded: { - if (contentX == 0) { - interactive = true - } else { + if (contentX == width) { visible = false mainScreen.resetLockTimer() } |