diff options
author | Bea Lam <bea.lam@nokia.com> | 2012-02-22 17:23:47 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-29 01:20:00 +0100 |
commit | ba3ac328ca721712c56f28a1fc6ae8e64b6ad7f2 (patch) | |
tree | e837ccca1a4e51710e662dba01a4ee9eaa26ab4b /doc | |
parent | 76c695c9a257c3ac914c11c283f04209075bc290 (diff) |
Add generic "displaced" transition property
This is the default displaced transition that will be applied if addDisplaced,
removeDisplaced or moveDisplaced are not specified (or are disabled).
Change-Id: I9356036dc93bd9cb26e64e0b1769228113b74273
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'doc')
7 files changed, 20 insertions, 20 deletions
diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-basic.qml b/doc/src/snippets/declarative/viewtransitions/viewtransitions-basic.qml index 8a05491ee1..cb94acb2b1 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-basic.qml +++ b/doc/src/snippets/declarative/viewtransitions/viewtransitions-basic.qml @@ -60,7 +60,7 @@ ListView { NumberAnimation { property: "scale"; from: 0; to: 1.0; duration: 400 } } - addDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-delayedbyindex.qml b/doc/src/snippets/declarative/viewtransitions/viewtransitions-delayedbyindex.qml index 79d00d2d1c..84c4848a76 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-delayedbyindex.qml +++ b/doc/src/snippets/declarative/viewtransitions/viewtransitions-delayedbyindex.qml @@ -60,12 +60,12 @@ ListView { } //! [0] - addDisplaced: Transition { - id: addDispTrans + displaced: Transition { + id: dispTrans SequentialAnimation { PauseAnimation { - duration: (addDispTrans.ViewTransition.index - - addDispTrans.ViewTransition.targetIndexes[0]) * 100 + duration: (dispTrans.ViewTransition.index - + dispTrans.ViewTransition.targetIndexes[0]) * 100 } NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-intermediatemove.qml b/doc/src/snippets/declarative/viewtransitions/viewtransitions-intermediatemove.qml index a43d3a8b7f..89353b40e8 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-intermediatemove.qml +++ b/doc/src/snippets/declarative/viewtransitions/viewtransitions-intermediatemove.qml @@ -60,20 +60,20 @@ ListView { } //! [0] - addDisplaced: Transition { - id: addDispTrans + displaced: Transition { + id: dispTrans SequentialAnimation { PauseAnimation { - duration: (addDispTrans.ViewTransition.index - - addDispTrans.ViewTransition.targetIndexes[0]) * 100 + duration: (dispTrans.ViewTransition.index - + dispTrans.ViewTransition.targetIndexes[0]) * 100 } ParallelAnimation { NumberAnimation { - property: "x"; to: addDispTrans.ViewTransition.item.x + 20 + property: "x"; to: dispTrans.ViewTransition.item.x + 20 easing.type: Easing.OutQuad } NumberAnimation { - property: "y"; to: addDispTrans.ViewTransition.item.y + 50 + property: "y"; to: dispTrans.ViewTransition.item.y + 50 easing.type: Easing.OutQuad } } diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-interruptedgood.qml b/doc/src/snippets/declarative/viewtransitions/viewtransitions-interruptedgood.qml index 1355268710..0644caaec7 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-interruptedgood.qml +++ b/doc/src/snippets/declarative/viewtransitions/viewtransitions-interruptedgood.qml @@ -60,7 +60,7 @@ ListView { } //! [0] - addDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } // ensure opacity and scale values return to 1.0 diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-pathanim.qml b/doc/src/snippets/declarative/viewtransitions/viewtransitions-pathanim.qml index 3d075c4367..4b1685719d 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-pathanim.qml +++ b/doc/src/snippets/declarative/viewtransitions/viewtransitions-pathanim.qml @@ -76,20 +76,20 @@ ListView { } //! [0] - addDisplaced: Transition { - id: addDispTrans + displaced: Transition { + id: dispTrans SequentialAnimation { PauseAnimation { - duration: (addDispTrans.ViewTransition.index - - addDispTrans.ViewTransition.targetIndexes[0]) * 100 + duration: (dispTrans.ViewTransition.index - + dispTrans.ViewTransition.targetIndexes[0]) * 100 } ParallelAnimation { NumberAnimation { - property: "x"; to: addDispTrans.ViewTransition.item.x + 20 + property: "x"; to: dispTrans.ViewTransition.item.x + 20 easing.type: Easing.OutQuad } NumberAnimation { - property: "y"; to: addDispTrans.ViewTransition.item.y + 50 + property: "y"; to: dispTrans.ViewTransition.item.y + 50 easing.type: Easing.OutQuad } } diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactionbad.qml b/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactionbad.qml index 03348356e1..0e7d1e8d82 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactionbad.qml +++ b/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactionbad.qml @@ -70,7 +70,7 @@ ListView { } } - moveDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactiongood.qml b/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactiongood.qml index eda5c35479..7fa7e48f82 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactiongood.qml +++ b/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactiongood.qml @@ -73,7 +73,7 @@ ListView { } //! [0] - moveDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } |