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

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 // FlickThreshold determines how far the "mouse" must have moved
 // before we perform a flick.
 static const int FlickThreshold = 20;
 // Really slow flicks can be annoying.
-static const int minimumFlickVelocity = 200;
+static const int MinimumFlickVelocity = 75;
 QDeclarativeFlickableVisibleArea::QDeclarativeFlickableVisibleArea(QDeclarativeFlickable *parent)
 : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
 , m_yPosition(0.), m_heightRatio(0.)
 {
 }
 /*!
 \qmlclass Flickable QDeclarativeFlickable
 \since 4.7
+\ingroup qml-basic-interaction-elements
 \brief The Flickable item provides a surface that can be "flicked".
 \inherits Item
 Flickable places its children on a surface that can be dragged and flicked.
 stealMouse = false;
 pressed = true;
 timeline.clear();
 hData.velocity = 0;
 vData.velocity = 0;
+hData.dragStartOffset = 0;
+vData.dragStartOffset = 0;
 lastPos = QPoint();
 QDeclarativeItemPrivate::start(lastPosTime);
 pressPos = event->pos();
 hData.pressPos = hData.move.value();
 vData.pressPos = vData.move.value();
 bool rejectX = false;
 if (q->yflick()) {
 int dy = int(event->pos().y() - pressPos.y());
 if (qAbs(dy) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) {
-qreal newY = dy + vData.pressPos;
+if (!vMoved)
+vData.dragStartOffset = dy;
+qreal newY = dy + vData.pressPos - vData.dragStartOffset;
 const qreal minY = q->minYExtent();
 const qreal maxY = q->maxYExtent();
 if (newY > minY)
 newY = minY + (newY - minY) / 2;
 if (newY < maxY && maxY - minY <= 0)
 newY = maxY + (newY - maxY) / 2;
 if (boundsBehavior == QDeclarativeFlickable::StopAtBounds && (newY > minY || newY < maxY)) {
-if (newY > minY)
+rejectY = true;
+if (newY < maxY) {
+newY = maxY;
+rejectY = false;
+}
+if (newY > minY) {
 newY = minY;
-else if (newY < maxY)
+rejectY = false;
-newY = maxY;
+}
-else
-rejectY = true;
 }
 if (!rejectY && stealMouse) {
 vData.move.setValue(qRound(newY));
 vMoved = true;
 }
 }
 if (q->xflick()) {
 int dx = int(event->pos().x() - pressPos.x());
 if (qAbs(dx) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) {
-qreal newX = dx + hData.pressPos;
+if (!hMoved)
+hData.dragStartOffset = dx;
+qreal newX = dx + hData.pressPos - hData.dragStartOffset;
 const qreal minX = q->minXExtent();
 const qreal maxX = q->maxXExtent();
 if (newX > minX)
 newX = minX + (newX - minX) / 2;
 if (newX < maxX && maxX - minX <= 0)
 newX = maxX + (newX - maxX) / 2;
 if (boundsBehavior == QDeclarativeFlickable::StopAtBounds && (newX > minX || newX < maxX)) {
-if (newX > minX)
+rejectX = true;
+if (newX < maxX) {
+newX = maxX;
+rejectX = false;
+}
+if (newX > minX) {
 newX = minX;
-else if (newX < maxX)
+rejectX = false;
-newX = maxX;
+}
-else
-rejectX = true;
 }
 if (!rejectX && stealMouse) {
 hData.move.setValue(qRound(newX));
 hMoved = true;
 }
 hData.velocity = 0.0;
 vData.velocity = 0.0;
 }
 vTime = timeline.time();
-if (qAbs(vData.velocity) > 10 && qAbs(event->pos().y() - pressPos.y()) > FlickThreshold) {
+if (qAbs(vData.velocity) > MinimumFlickVelocity && qAbs(event->pos().y() - pressPos.y()) > FlickThreshold)
-qreal velocity = vData.velocity;
+flickY(vData.velocity);
-if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks.
+else
-velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity;
-flickY(velocity);
-} else {
 fixupY();
-}
+if (qAbs(hData.velocity) > MinimumFlickVelocity && qAbs(event->pos().x() - pressPos.x()) > FlickThreshold)
-if (qAbs(hData.velocity) > 10 && qAbs(event->pos().x() - pressPos.x()) > FlickThreshold) {
+flickX(hData.velocity);
-qreal velocity = hData.velocity;
+else
-if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks.
-velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity;
-flickX(velocity);
-} else {
 fixupX();
-}
 lastPosTime.invalidate();
 if (!timeline.isActive())
 q->movementEnding();
 Q_D(QDeclarativeFlickable);
 QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
 bool changed = false;
 if (newGeometry.width() != oldGeometry.width()) {
+if (xflick())
+changed = true;
 if (d->hData.viewSize < 0) {
 d->contentItem->setWidth(width());
 emit contentWidthChanged();
 }
 }
 if (newGeometry.height() != oldGeometry.height()) {
+if (yflick())
+changed = true;
 if (d->vData.viewSize < 0) {
 d->contentItem->setHeight(height());
 emit contentHeightChanged();
 }
 }
 movementEnding();
 }
 void QDeclarativeFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
 {
-QDeclarativeItem *i = qobject_cast<QDeclarativeItem *>(o);
+QGraphicsObject *i = qobject_cast<QGraphicsObject *>(o);
 if (i)
 i->setParentItem(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem);
 else
 o->setParent(prop->object);
 }
 d->lastPosTime.invalidate();
 }
 if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease) {
 d->clearDelayedPress();
 d->stealMouse = false;
+d->pressed = false;
 }
 return false;
 }
 bool QDeclarativeFlickable::sceneEventFilter(QGraphicsItem *i, QEvent *e)
 emit flickingChanged();
 emit flickingVerticallyChanged();
 if (!d->flickingHorizontally)
 emit flickEnded();
 }
-if (d->movingHorizontally) {
+if (!d->pressed && !d->stealMouse) {
-d->movingHorizontally = false;
+if (d->movingHorizontally) {
-d->hMoved = false;
+d->movingHorizontally = false;
-emit movingChanged();
+d->hMoved = false;
-emit movingHorizontallyChanged();
+emit movingChanged();
-if (!d->movingVertically)
+emit movingHorizontallyChanged();
-emit movementEnded();
+if (!d->movingVertically)
-}
+emit movementEnded();
-if (d->movingVertically) {
+}
-d->movingVertically = false;
+if (d->movingVertically) {
-d->vMoved = false;
+d->movingVertically = false;
-emit movingChanged();
+d->vMoved = false;
-emit movingVerticallyChanged();
+emit movingChanged();
-if (!d->movingHorizontally)
+emit movingVerticallyChanged();
-emit movementEnded();
+if (!d->movingHorizontally)
+emit movementEnded();
+}
 }
 d->hData.smoothVelocity.setValue(0);
 d->vData.smoothVelocity.setValue(0);
 }

changeset 37	758a864f9613
parent 33	3e2da88830cd