diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
| commit | bde8c3cd9583ed9f3bdfc36a8699f56db20a6928 (patch) | |
| tree | 33246b027739aafd72f9f289876f69627537f2b3 /src/quick/items/qquickitemviewtransition.cpp | |
| parent | b63bc868875d7571bc332804f984824cff7c5b78 (diff) | |
| parent | 685ad676a84bf48602a5da8f7171792686b94a73 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir.cpp
src/qml/jsruntime/qv4mathobject.cpp
Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637
Diffstat (limited to 'src/quick/items/qquickitemviewtransition.cpp')
| -rw-r--r-- | src/quick/items/qquickitemviewtransition.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 04d93937eb..745e5b275f 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -639,7 +639,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) attached property can be used to augment view transitions. - \section2 View transitions: a simple example + \section2 View Transitions: a Simple Example Here is a basic example of the use of view transitions. The view below specifies transitions for the \c add and \c displaced properties, which will be run when items are added to the view: @@ -668,7 +668,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) are some examples of how this can be achieved. - \section2 Using the ViewTransition attached property + \section2 Using the ViewTransition Attached Property As stated, the various ViewTransition properties provide details specific to the individual item being transitioned as well as the operation that triggered the transition. In the animation above, @@ -719,7 +719,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) that is triggered by a particular add operation. - \section3 Delaying animations based on index + \section3 Delaying Animations Based on Index Since each view transition is run once for each item affected by the transition, the ViewTransition properties can be used within a transition to define custom behavior for each item's transition. @@ -738,7 +738,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) \image viewtransitions-delayedbyindex.gif - \section3 Animating items to intermediate positions + \section3 Animating Items to Intermediate Positions The ViewTransition.item property gives a reference to the item to which the transition is being applied. This can be used to access any of the item's attributes, custom \c property values, @@ -775,7 +775,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) \image viewtransitions-pathanim.gif - \section2 Handling interrupted animations + \section2 Handling Interrupted Animations A view transition may be interrupted at any time if a different view transition needs to be applied while the original transition is in progress. For example, say Item A is inserted at index 0 @@ -819,7 +819,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) properties. - \section2 Restrictions regarding ScriptAction + \section2 Restrictions Regarding ScriptAction When a view transition is initialized, any property bindings that refer to the ViewTransition attached property are evaluated in preparation for the transition. Due to the nature of the |