summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-03-05 01:33:57 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-03-05 01:33:57 (GMT)
commit356963b1bc81dcad1826449da14b6130eea9cc3f (patch)
tree215d3abbee262a9f3166517e0c91efbf76749de7 /src/declarative
parentfefa0bb4701e0899c4b087864fcf109330fca64d (diff)
downloadQt-356963b1bc81dcad1826449da14b6130eea9cc3f.zip
Qt-356963b1bc81dcad1826449da14b6130eea9cc3f.tar.gz
Qt-356963b1bc81dcad1826449da14b6130eea9cc3f.tar.bz2
Document new ParentChange properties.
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qdeclarativestateoperations.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index cea9ad7..cd06380 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -158,17 +158,17 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
\qmlclass ParentChange QDeclarativeParentChange
\brief The ParentChange element allows you to reparent an Item in a state change.
- ParentChange reparents an Item while preserving its visual appearance (position, rotation,
- and scale) on screen. You can then specify a transition to move/rotate/scale the Item to
- its final intended appearance.
+ ParentChange reparents an item while preserving its visual appearance (position, size,
+ rotation, and scale) on screen. You can then specify a transition to move/resize/rotate/scale
+ the item to its final intended appearance.
ParentChange can only preserve visual appearance if no complex transforms are involved.
More specifically, it will not work if the transform property has been set for any
- Items involved in the reparenting (defined as any Items in the common ancestor tree
+ items involved in the reparenting (i.e. items in the common ancestor tree
for the original and new parent).
You can specify at which point in a transition you want a ParentChange to occur by
- using a ParentAction.
+ using a ParentAnimation or ParentAction.
*/
@@ -181,6 +181,16 @@ QDeclarativeParentChange::~QDeclarativeParentChange()
{
}
+/*!
+ \qmlproperty real ParentChange::x
+ \qmlproperty real ParentChange::y
+ \qmlproperty real ParentChange::width
+ \qmlproperty real ParentChange::height
+ \qmlproperty real ParentChange::scale
+ \qmlproperty real ParentChange::rotation
+ These properties hold the new position, size, scale, and rotation
+ for the item in this state.
+*/
qreal QDeclarativeParentChange::x() const
{
Q_D(const QDeclarativeParentChange);
@@ -314,7 +324,7 @@ void QDeclarativeParentChange::setObject(QDeclarativeItem *target)
/*!
\qmlproperty Item ParentChange::parent
- This property holds the parent for the item in this state
+ This property holds the new parent for the item in this state.
*/
QDeclarativeItem *QDeclarativeParentChange::parent() const