From 566b23df8c31b50fc514a069564d23121d0f4ef9 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 2 Feb 2015 12:43:49 +0100 Subject: Doc: link issues qtdeclarative Task-number: QTBUG-43810 Change-Id: I154ffa83512435c3e455937a3f81931a45d9e368 Reviewed-by: Martin Smith --- src/quick/items/qquickitem.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/quick/items/qquickitem.cpp') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 2722f48ce9..6a00f80171 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1756,11 +1756,9 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) QQmlProperty(), or QMetaProperty::write() when you need to modify those properties from C++. This ensures that the QML engine knows about the property change. Otherwise, the engine won't be able to carry out your - requested animation. For example, if you call \l setPosition() directly, - any behavior that reacts to changes in the x or y properties will not take - effect, as you are bypassing Qt's meta-object system. Note that these - functions incur a slight performance penalty. For more details, see - \l {Accessing Members of a QML Object Type from C++}. + requested animation. + Note that these functions incur a slight performance penalty. For more + details, see \l {Accessing Members of a QML Object Type from C++}. \sa QQuickWindow, QQuickPaintedItem */ @@ -5059,7 +5057,7 @@ void QQuickItem::setZ(qreal v) \endqml \endtable - \sa transform, Rotation + \sa Transform, Rotation */ /*! \property QQuickItem::rotation @@ -5085,7 +5083,7 @@ void QQuickItem::setZ(qreal v) \endqml \endtable - \sa transform, Rotation + \sa Transform, Rotation */ qreal QQuickItem::rotation() const { @@ -5145,7 +5143,7 @@ void QQuickItem::setRotation(qreal r) \endqml \endtable - \sa transform, Scale + \sa Transform, Scale */ /*! \property QQuickItem::scale @@ -5184,7 +5182,7 @@ void QQuickItem::setRotation(qreal r) \endqml \endtable - \sa transform, Scale + \sa Transform, Scale */ qreal QQuickItem::scale() const { -- cgit v1.2.3 From 1cb329aaaa68ead31c0ae91a69193c7ae08e25b0 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 12 Feb 2015 15:36:44 +1000 Subject: Fix width/height property assignment during animations. During animations the behavior of anchors.fill: parent and width: parent.width height: parent.height can be different resulting in subtle UI bugs where the final value of a property is not applied because it is within epsilon of the previous value. Fixed by directly comparing the width and height instead of using operator==(QSize, QSize) which does a fuzzy comparison. Change-Id: I4288b93db2b7baacd9f71ae1932ae743a428313a Reviewed-by: Andrew den Exter Reviewed-by: Gunnar Sletta --- src/quick/items/qquickitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/items/qquickitem.cpp') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 6a00f80171..d1369fb3ff 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -6372,7 +6372,7 @@ void QQuickItem::setSize(const QSizeF &size) d->heightValid = true; d->widthValid = true; - if (QSizeF(d->width, d->height) == size) + if (d->width == size.width() && d->height == size.height()) return; qreal oldHeight = d->height; -- cgit v1.2.3