diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 01:57:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 01:57:59 (GMT) |
| commit | dc37f4ff3439e44df65d24aea4354c80d2a02293 (patch) | |
| tree | 4abfe252bce42c40b9d4052c6a007638b2a1708a /src | |
| parent | e7b78d2225c5338545852330c9160084f12ffe1f (diff) | |
| parent | 19473443dbeff4a57cd6ec6572ca29c2e70d672c (diff) | |
| download | Qt-dc37f4ff3439e44df65d24aea4354c80d2a02293.zip Qt-dc37f4ff3439e44df65d24aea4354c80d2a02293.tar.gz Qt-dc37f4ff3439e44df65d24aea4354c80d2a02293.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105
Always place PathView delegates centered on the path
Add a PathView example.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepathview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index f4ebd13..acf9827 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -284,8 +284,8 @@ void QDeclarativePathViewPrivate::updateItem(QDeclarativeItem *item, qreal perce att->setValue(attr.toUtf8(), path->attributeAt(attr, percent)); } QPointF pf = path->pointAt(percent); - item->setX(qRound(pf.x() - item->width()*item->scale()/2)); - item->setY(qRound(pf.y() - item->height()*item->scale()/2)); + item->setX(qRound(pf.x() - item->width()/2)); + item->setY(qRound(pf.y() - item->height()/2)); } void QDeclarativePathViewPrivate::regenerate() |