PathView offset out of sync with currentIndex when items are removed.

If the view is animating due to currentIndex change and items are
removed the target offset must be recalculated.

Change-Id: Iee105712488070c086a24561a49daf17bcf14076
Task-number: QTBUG-18825
Reviewed-by: Michael Brasser

Author: Martin Jones

src/declarative/graphicsitems/qdeclarativepathview.cpp

@@ -1525,6 +1525,8 @@ void QDeclarativePathView::itemsRemoved(int modelIndex, int count)
     } else {
         d->regenerate();
         d->updateCurrent();
+        if (!d->flicking && !d->moving && d->haveHighlightRange && d->highlightRangeMode == QDeclarativePathView::StrictlyEnforceRange)
+            d->snapToCurrent();
     }
     if (changedOffset)
         emit offsetChanged();

tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp

@@ -458,6 +458,16 @@ void tst_QDeclarativePathView::dataModel()
     model.removeItem(model.count()-1);
     QCOMPARE(pathview->currentIndex(), model.count()-1);
 
+    // QTBUG-18825
+    // Confirm that the target offset is adjusted when removing items
+    pathview->setCurrentIndex(model.count()-1);
+    QTRY_COMPARE(pathview->offset(), 1.);
+    pathview->setCurrentIndex(model.count()-5);
+    model.removeItem(model.count()-1);
+    model.removeItem(model.count()-1);
+    model.removeItem(model.count()-1);
+    QTRY_COMPARE(pathview->offset(), 2.);
+
     delete canvas;
 }