diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
commit | 13086523d7181d5628872c74030b460e5f7388a5 (patch) | |
tree | f5b3317c138fb18d47d8b2e0060bc4a8512da1a1 /src/declarative/fx | |
parent | 3c45c081ce33f05ae200d252ebb5e9e1484bcc6d (diff) | |
parent | 40a59d973c324e45954481f608e1bfc2b9579300 (diff) | |
download | Qt-13086523d7181d5628872c74030b460e5f7388a5.zip Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.gz Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/states/states.qml
examples/declarative/states/transitions.qml
examples/declarative/tutorials/helloworld/t3/tutorial3.qml
src/declarative/util/qmlanimation.cpp
Diffstat (limited to 'src/declarative/fx')
-rw-r--r-- | src/declarative/fx/qfxanchors.cpp | 6 | ||||
-rw-r--r-- | src/declarative/fx/qfxflipable.cpp | 2 | ||||
-rw-r--r-- | src/declarative/fx/qfxhighlightfilter.cpp | 2 | ||||
-rw-r--r-- | src/declarative/fx/qfxlayouts.cpp | 24 |
4 files changed, 20 insertions, 14 deletions
diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 3da58a2..feac96e 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -772,6 +772,7 @@ void QFxAnchors::setLeftMargin(int offset) if (d->leftMargin == offset) return; d->leftMargin = offset; + d->updateHorizontalAnchors(); emit leftMarginChanged(); } @@ -787,6 +788,7 @@ void QFxAnchors::setRightMargin(int offset) if (d->rightMargin == offset) return; d->rightMargin = offset; + d->updateHorizontalAnchors(); emit rightMarginChanged(); } @@ -802,6 +804,7 @@ void QFxAnchors::setHorizontalCenterOffset(int offset) if (d->hCenterOffset == offset) return; d->hCenterOffset = offset; + d->updateHorizontalAnchors(); emit horizontalCenterOffsetChanged(); } @@ -817,6 +820,7 @@ void QFxAnchors::setTopMargin(int offset) if (d->topMargin == offset) return; d->topMargin = offset; + d->updateVerticalAnchors(); emit topMarginChanged(); } @@ -832,6 +836,7 @@ void QFxAnchors::setBottomMargin(int offset) if (d->bottomMargin == offset) return; d->bottomMargin = offset; + d->updateVerticalAnchors(); emit bottomMarginChanged(); } @@ -847,6 +852,7 @@ void QFxAnchors::setVerticalCenterOffset(int offset) if (d->vCenterOffset == offset) return; d->vCenterOffset = offset; + d->updateVerticalAnchors(); emit verticalCenterOffsetChanged(); } diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index 4c02e74..9595724 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -94,7 +94,7 @@ Flipable { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { easing: "easeInOutQuad" properties: "rotation" } diff --git a/src/declarative/fx/qfxhighlightfilter.cpp b/src/declarative/fx/qfxhighlightfilter.cpp index 1671fc6..78a91af 100644 --- a/src/declarative/fx/qfxhighlightfilter.cpp +++ b/src/declarative/fx/qfxhighlightfilter.cpp @@ -80,7 +80,7 @@ Text { text: "Highlight" filter: Highlight { source: "pics/highlight.png" - xOffset: NumericAnimation { + xOffset: NumberAnimation { running: true repeat: true from: 320 diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index a975778..e27135c 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -132,7 +132,7 @@ BaseLayout { id: layout y: 0 move: Transition { - NumericAnimation { + NumberAnimation { properties: "y" ease: "easeOutBounce" } @@ -161,7 +161,7 @@ BaseLayout { id: layout y: 0 add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -196,7 +196,7 @@ BaseLayout { id: layout y: 0 remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -512,7 +512,7 @@ VerticalLayout { VerticalLayout { id: layout remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -539,7 +539,7 @@ VerticalLayout { VerticalLayout { id: layout add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -566,7 +566,7 @@ VerticalLayout { VerticalLayout { id: layout move: Transition { - NumericAnimation { + NumberAnimation { properties: "y" ease: "easeOutBounce" } @@ -683,7 +683,7 @@ HorizontalLayout { HorizontalLayout { id: layout remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -705,7 +705,7 @@ HorizontalLayout { HorizontalLayout { id: layout add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -727,7 +727,7 @@ HorizontalLayout { HorizontalLayout { id: layout move: Transition { - NumericAnimation { + NumberAnimation { properties: "x" ease: "easeOutBounce" } @@ -875,7 +875,7 @@ GridLayout { GridLayout { id: layout remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -900,7 +900,7 @@ GridLayout { GridLayout { id: layout add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -923,7 +923,7 @@ GridLayout { GridLayout { id: layout move: Transition { - NumericAnimation { + NumberAnimation { properties: "x,y" ease: "easeOutBounce" } |