Fix flickable stealing gestures when height >= contentHeight.

Or width >= contentWidth.

If newY is equal to both maxY and minY then the second assignment to
rejectY can clobber the first.  Changing the second assignment to an
|= means rejectY is true if either is true.

Secondly maxY became positive when height was greater than contentHeight
instead of having a maximum of 0, which ensured rejectY evaluated to false
in the case newY <= maxY and the mouse was stolen.

Change-Id: I6416d0e23c3ef898887a7b3e3fcdc1dc12853548
Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>

2 files changed, 38 insertions, 4 deletions

diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 9c03a6db28..a9396051ab 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1041,7 +1041,7 @@ void QQuickFlickablePrivate::drag(qint64 currentTimestamp, QEvent::Type eventTyp
                 }
                 if (fuzzyLessThanOrEqualTo(minY, newY)) {
                     newY = minY;
-                    rejectY = vData.pressPos == minY && vData.move.value() == minY && dy > 0;
+                    rejectY |= vData.pressPos == minY && vData.move.value() == minY && dy > 0;
                 }
             } else {
                 qreal vel = velocity.y() / QML_FLICK_OVERSHOOTFRICTION;
@@ -1101,7 +1101,7 @@ void QQuickFlickablePrivate::drag(qint64 currentTimestamp, QEvent::Type eventTyp
                 }
                 if (fuzzyLessThanOrEqualTo(minX, newX)) {
                     newX = minX;
-                    rejectX = hData.pressPos == minX && hData.move.value() == minX && dx > 0;
+                    rejectX |= hData.pressPos == minX && hData.move.value() == minX && dx > 0;
                 }
             } else {
                 qreal vel = velocity.x() / QML_FLICK_OVERSHOOTFRICTION;
@@ -1527,13 +1527,13 @@ qreal QQuickFlickable::minXExtent() const
 qreal QQuickFlickable::maxXExtent() const
 {
     Q_D(const QQuickFlickable);
-    return width() - vWidth() - d->hData.endMargin;
+    return qMin<qreal>(0, width() - vWidth() - d->hData.endMargin);
 }
 /* returns -ve */
 qreal QQuickFlickable::maxYExtent() const
 {
     Q_D(const QQuickFlickable);
-    return height() - vHeight() - d->vData.endMargin;
+    return qMin<qreal>(0, height() - vHeight() - d->vData.endMargin);
 }
 
 void QQuickFlickable::componentComplete()
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index 86baed4e51..5c96cc151e 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -1493,6 +1493,40 @@ void tst_qquickflickable::nestedStopAtBounds()
     QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
 
     QTRY_VERIFY(!outer->isMoving());
+
+    axis = 200;
+    inner->setContentX(0);
+    inner->setContentY(0);
+    inner->setContentWidth(inner->width());
+    inner->setContentHeight(inner->height());
+
+    // Drag inner with equal size and contentSize
+    QTest::mousePress(&view, Qt::LeftButton, 0, position);
+    QTest::qWait(10);
+    axis += invert ? -threshold * 2 : threshold * 2;
+    QTest::mouseMove(&view, position);
+    axis += invert ? -threshold : threshold;
+    QTest::mouseMove(&view, position);
+    QCOMPARE(outer->isDragging(), true);
+    QCOMPARE(inner->isDragging(), false);
+    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
+
+    axis = 200;
+    inner->setContentX(0);
+    inner->setContentY(0);
+    inner->setContentWidth(inner->width() - 100);
+    inner->setContentHeight(inner->height() - 100);
+
+    // Drag inner with size greater than contentSize
+    QTest::mousePress(&view, Qt::LeftButton, 0, position);
+    QTest::qWait(10);
+    axis += invert ? -threshold * 2 : threshold * 2;
+    QTest::mouseMove(&view, position);
+    axis += invert ? -threshold : threshold;
+    QTest::mouseMove(&view, position);
+    QCOMPARE(outer->isDragging(), true);
+    QCOMPARE(inner->isDragging(), false);
+    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
 }
 
 void tst_qquickflickable::stopAtBounds_data()