FCL/sf/mw/qt: comparison src/declarative/graphicsitems/qdeclarativepathview.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 if (att) {
 att->m_view = q;
 att->setOnPath(true);
 }
 item->setParentItem(q);
+QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(item));
+itemPrivate->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
 }
 requestedIndex = -1;
 return item;
 }
 {
 if (!item || !model)
 return;
 if (QDeclarativePathViewAttached *att = attached(item))
 att->setOnPath(false);
+QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(item));
+itemPrivate->removeItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
 model->release(item);
 }
 QDeclarativePathViewAttached *QDeclarativePathViewPrivate::attached(QDeclarativeItem *item)
 {
 if (QDeclarativePathViewAttached *att = attached(item)) {
 foreach(const QString &attr, path->attributes())
 att->setValue(attr.toUtf8(), path->attributeAt(attr, percent));
 }
 QPointF pf = path->pointAt(percent);
-item->setX(qRound(pf.x() - item->width()*item->scale()/2));
+item->setX(qRound(pf.x() - item->width()/2));
-item->setY(qRound(pf.y() - item->height()*item->scale()/2));
+item->setY(qRound(pf.y() - item->height()/2));
 }
 void QDeclarativePathViewPrivate::regenerate()
 {
 Q_Q(QDeclarativePathView);
 \qmlclass PathView QDeclarativePathView
 \since 4.7
 \brief The PathView element lays out model-provided items on a path.
 \inherits Item
-The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in QML.
+A PathView displays data from models created from built-in QML elements like ListModel
+and XmlListModel, or custom model classes defined in C++ that inherit from
+QAbstractListModel.
+A ListView has a \l model, which defines the data to be displayed, and
+a \l delegate, which defines how the data should be displayed.
 The \l delegate is instantiated for each item on the \l path.
 The items may be flicked to move them along the path.
+For example, if there is a simple list model defined in a file \c ContactModel.qml like this:
+\snippet doc/src/snippets/declarative/pathview/ContactModel.qml 0
+This data can be represented as a PathView, like this:
 \snippet doc/src/snippets/declarative/pathview/pathview.qml 0
 \image pathview.gif
+(Note the above example uses PathAttribute to scale and modify the
+opacity of the items as they rotate. This additional code can be seen in the
+PathAttribute documentation.)
 Delegates are instantiated as needed and may be destroyed at any time.
 State should \e never be stored in a delegate.
 \bold Note that views do not enable \e clip automatically.  If the view
 if (d->attType)
 d->attType->release();
 if (d->ownModel)
 delete d->model;
 }
+/*!
+\qmlattachedproperty PathView PathView::view
+This attached property holds the view that manages this delegate instance.
+It is attached to each instance of the delegate.
+*/
 /*!
 \qmlattachedproperty bool PathView::onPath
 This attached property holds whether the item is currently on the path.
 /*!
 \qmlmethod PathView::incrementCurrentIndex()
 Increments the current index.
+\bold Note: methods should only be called after the Component has completed.
 */
 void QDeclarativePathView::incrementCurrentIndex()
 {
 setCurrentIndex(currentIndex()+1);
 }
 /*!
 \qmlmethod PathView::decrementCurrentIndex()
 Decrements the current index.
+\bold Note: methods should only be called after the Component has completed.
 */
 void QDeclarativePathView::decrementCurrentIndex()
 {
 Q_D(QDeclarativePathView);
 if (d->model && d->model->count()) {
 if (i == d->pathItems)
 return;
 if (i < 1)
 i = 1;
 d->pathItems = i;
+d->updateMappedRange();
 if (d->isValid() && isComponentComplete()) {
 d->regenerate();
 }
 emit pathItemCountChanged();
 }
 }
 void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
 Q_D(QDeclarativePathView);
-if (!d->interactive || d->lastPosTime.isNull())
+if (!d->interactive || !d->lastPosTime.isValid())
 return;
 if (!d->stealMouse) {
 QPointF delta = event->pos() - d->startPoint;
 if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance())
 void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
 {
 Q_D(QDeclarativePathView);
 d->stealMouse = false;
 setKeepMouseGrab(false);
-if (!d->interactive || d->lastPosTime.isNull())
+if (!d->interactive || !d->lastPosTime.isValid())
 return;
 qreal elapsed = qreal(d->lastElapsed + QDeclarativeItemPrivate::elapsed(d->lastPosTime)) / 1000.;
 qreal velocity = elapsed > 0. ? d->lastDist / elapsed : 0;
 if (d->model && d->model->count() && qAbs(velocity) > 1.) {
 d->tl.callback(QDeclarativeTimeLineCallback(&d->moveOffset, d->fixOffsetCallback, d));
 } else {
 d->fixOffset();
 }
-d->lastPosTime = QTime();
+d->lastPosTime.invalidate();
 ungrabMouse();
 }
 bool QDeclarativePathView::sendMouseEvent(QGraphicsSceneMouseEvent *event)
 {
 grabber = qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem());
 if (grabber && d->stealMouse && !grabber->keepMouseGrab() && grabber != this)
 grabMouse();
 return d->stealMouse;
-} else if (!d->lastPosTime.isNull()) {
+} else if (d->lastPosTime.isValid()) {
-d->lastPosTime = QTime();
+d->lastPosTime.invalidate();
 }
 return false;
 }
 bool QDeclarativePathView::sceneEventFilter(QGraphicsItem *i, QEvent *e)
 }
 return QDeclarativeItem::sceneEventFilter(i, e);
 }
+bool QDeclarativePathView::event(QEvent *event)
+{
+if (event->type() == QEvent::User) {
+refill();
+return true;
+}
+return QDeclarativeItem::event(event);
+}
 void QDeclarativePathView::componentComplete()
 {
 Q_D(QDeclarativePathView);
 QDeclarativeItem::componentComplete();
 d->createHighlight();
 {
 Q_D(QDeclarativePathView);
 if (!d->isValid() || !isComponentComplete())
 return;
+d->layoutScheduled = false;
 bool currentVisible = false;
 // first move existing items and remove items off path
 int idx = d->firstIndex;
 QList<QDeclarativeItem*>::iterator it = d->items.begin();

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613