Cannot flick to the end of a horizontal ListView with LayoutMirroring

Forward port of fix for QTBUG-21756.
minXExtent calculated the offset due to highlight range incorrectly
(reversed) when mirroring enabled.  Also us same algorithm for fixup()
in GridView and ListView uses.

For QtQuick 2, this change also reverses the beginning and end highlight
range, as it should be, i.e. the preferredHighlightBegin is from the
right side in RightToLeft mode.  Also added snapping tests.

Task-number: QTBUG-21756
Change-Id: Ica0ba4ab5db0ce9c77f2da75e9f8293550bd37d1
Reviewed-by: Martin Jones <martin.jones@nokia.com>

5 files changed, 72 insertions, 142 deletions

diff --git a/src/declarative/items/qsggridview.cpp b/src/declarative/items/qsggridview.cpp
index fd2742c2f3..6b01583497 100644
--- a/src/declarative/items/qsggridview.cpp
+++ b/src/declarative/items/qsggridview.cpp
@@ -334,7 +334,10 @@ qreal QSGGridViewPrivate::snapPosAt(qreal pos) const
     Q_Q(const QSGGridView);
     qreal snapPos = 0;
     if (!visibleItems.isEmpty()) {
-        qreal highlightStart = isRightToLeftTopToBottom() && highlightRangeStartValid ? size()-highlightRangeEnd : highlightRangeStart;
+        qreal highlightStart = highlightRangeStart;
+        if (isRightToLeftTopToBottom())
+            highlightStart = highlightRangeEndValid ? -size() + highlightRangeEnd : -size();
+
         pos += highlightStart;
         pos += rowSize()/2;
         snapPos = static_cast<FxGridItemSG*>(visibleItems.first())->rowPos() - visibleIndex / columns * rowSize();
@@ -807,19 +810,7 @@ void QSGGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
 
     fixupMode = moveReason == Mouse ? fixupMode : Immediate;
 
-    qreal highlightStart;
-    qreal highlightEnd;
-    qreal viewPos;
-    if (isRightToLeftTopToBottom()) {
-        // Handle Right-To-Left exceptions
-        viewPos = -position()-size();
-        highlightStart = highlightRangeStartValid ? size()-highlightRangeEnd : highlightRangeStart;
-        highlightEnd = highlightRangeEndValid ? size()-highlightRangeStart : highlightRangeEnd;
-    } else {
-        viewPos = position();
-        highlightStart = highlightRangeStart;
-        highlightEnd = highlightRangeEnd;
-    }
+    qreal viewPos = isRightToLeftTopToBottom() ? -position()-size() : position();
 
     bool strictHighlightRange = haveHighlightRange && highlightRange == QSGGridView::StrictlyEnforceRange;
     if (snapMode != QSGGridView::NoSnap) {
@@ -836,40 +827,35 @@ void QSGGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
                 bias = -bias;
             tempPosition -= bias;
         }
-        FxViewItem *topItem = snapItemAt(tempPosition+highlightStart);
+        FxViewItem *topItem = snapItemAt(tempPosition+highlightRangeStart);
         if (!topItem && strictHighlightRange && currentItem) {
             // StrictlyEnforceRange always keeps an item in range
             updateHighlight();
             topItem = currentItem;
         }
-        FxViewItem *bottomItem = snapItemAt(tempPosition+highlightEnd);
+        FxViewItem *bottomItem = snapItemAt(tempPosition+highlightRangeEnd);
         if (!bottomItem && strictHighlightRange && currentItem) {
             // StrictlyEnforceRange always keeps an item in range
             updateHighlight();
             bottomItem = currentItem;
         }
         qreal pos;
-        if (topItem && bottomItem && strictHighlightRange) {
-            qreal topPos = qMin(topItem->position() - highlightStart, -maxExtent);
-            qreal bottomPos = qMax(bottomItem->position() - highlightEnd, -minExtent);
-            pos = qAbs(data.move + topPos) < qAbs(data.move + bottomPos) ? topPos : bottomPos;
-        } else if (topItem) {
-            qreal headerPos = 0;
-            if (header)
-                headerPos = isRightToLeftTopToBottom() ? static_cast<FxGridItemSG*>(header)->rowPos() + cellWidth - headerSize() : static_cast<FxGridItemSG*>(header)->rowPos();
-            if (topItem->index == 0 && header && tempPosition+highlightStart < headerPos+headerSize()/2 && !strictHighlightRange) {
-                pos = isRightToLeftTopToBottom() ? - headerPos + highlightStart - size() : headerPos - highlightStart;
+        bool isInBounds = -position() > maxExtent && -position() <= minExtent;
+        if (topItem && (isInBounds || strictHighlightRange)) {
+            qreal headerPos = header ? static_cast<FxGridItemSG*>(header)->rowPos() : 0;
+            if (topItem->index == 0 && header && tempPosition+highlightRangeStart < headerPos+headerSize()/2 && !strictHighlightRange) {
+                pos = isRightToLeftTopToBottom() ? - headerPos + highlightRangeStart - size() : headerPos - highlightRangeStart;
             } else {
                 if (isRightToLeftTopToBottom())
-                    pos = qMax(qMin(-topItem->position() + highlightStart - size(), -maxExtent), -minExtent);
+                    pos = qMax(qMin(-topItem->position() + highlightRangeStart - size(), -maxExtent), -minExtent);
                 else
-                    pos = qMax(qMin(topItem->position() - highlightStart, -maxExtent), -minExtent);
+                    pos = qMax(qMin(topItem->position() - highlightRangeStart, -maxExtent), -minExtent);
             }
-        } else if (bottomItem) {
+        } else if (bottomItem && isInBounds) {
             if (isRightToLeftTopToBottom())
-                pos = qMax(qMin(-bottomItem->position() + highlightEnd - size(), -maxExtent), -minExtent);
+                pos = qMax(qMin(-bottomItem->position() + highlightRangeEnd - size(), -maxExtent), -minExtent);
             else
-                pos = qMax(qMin(bottomItem->position() - highlightEnd, -maxExtent), -minExtent);
+                pos = qMax(qMin(bottomItem->position() - highlightRangeEnd, -maxExtent), -minExtent);
         } else {
             QSGItemViewPrivate::fixup(data, minExtent, maxExtent);
             return;
@@ -890,10 +876,10 @@ void QSGGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
         if (currentItem) {
             updateHighlight();
             qreal pos = static_cast<FxGridItemSG*>(currentItem)->rowPos();
-            if (viewPos < pos + rowSize() - highlightEnd)
-                viewPos = pos + rowSize() - highlightEnd;
-            if (viewPos > pos - highlightStart)
-                viewPos = pos - highlightStart;
+            if (viewPos < pos + rowSize() - highlightRangeEnd)
+                viewPos = pos + rowSize() - highlightRangeEnd;
+            if (viewPos > pos - highlightRangeStart)
+                viewPos = pos - highlightRangeStart;
             if (isRightToLeftTopToBottom())
                 viewPos = -viewPos-size();
             timeline.reset(data.move);
@@ -1543,22 +1529,11 @@ void QSGGridView::viewportMoved()
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
             // reposition highlight
             qreal pos = d->highlight->position();
-            qreal viewPos;
-            qreal highlightStart;
-            qreal highlightEnd;
-            if (d->isRightToLeftTopToBottom()) {
-                viewPos = -d->position()-d->size();
-                highlightStart = d->highlightRangeStartValid ? d->size()-d->highlightRangeEnd : d->highlightRangeStart;
-                highlightEnd = d->highlightRangeEndValid ? d->size()-d->highlightRangeStart : d->highlightRangeEnd;
-            } else {
-                viewPos = d->position();
-                highlightStart = d->highlightRangeStart;
-                highlightEnd = d->highlightRangeEnd;
-            }
-            if (pos > viewPos + highlightEnd - d->highlight->size())
-                pos = viewPos + highlightEnd - d->highlight->size();
-            if (pos < viewPos + highlightStart)
-                pos = viewPos + highlightStart;
+            qreal viewPos = d->isRightToLeftTopToBottom() ? -d->position()-d->size() : d->position();
+            if (pos > viewPos + d->highlightRangeEnd - d->highlight->size())
+                pos = viewPos + d->highlightRangeEnd - d->highlight->size();
+            if (pos < viewPos + d->highlightRangeStart)
+                pos = viewPos + d->highlightRangeStart;
 
             if (pos != d->highlight->position()) {
                 d->highlightXAnimator->stop();
diff --git a/src/declarative/items/qsgitemview.cpp b/src/declarative/items/qsgitemview.cpp
index 075024db0f..5b95097dcc 100644
--- a/src/declarative/items/qsgitemview.cpp
+++ b/src/declarative/items/qsgitemview.cpp
@@ -821,30 +821,14 @@ void QSGItemView::trackedPositionChanged()
         if (d->trackedItem != d->currentItem) {
             trackedSize += d->currentItem->sectionSize();
         }
-        qreal viewPos;
-        qreal highlightStart;
-        qreal highlightEnd;
-        if (d->isContentFlowReversed()) {
-            viewPos = -d->position()-d->size();
-            highlightStart = d->highlightRangeStartValid ? d->size()-d->highlightRangeEnd : d->highlightRangeStart;
-            highlightEnd = d->highlightRangeEndValid ? d->size()-d->highlightRangeStart : d->highlightRangeEnd;
-        } else {
-            viewPos = d->position();
-            highlightStart = d->highlightRangeStart;
-            highlightEnd = d->highlightRangeEnd;
-        }
+        qreal viewPos = d->isContentFlowReversed() ? -d->position()-d->size() : d->position();
         qreal pos = viewPos;
         if (d->haveHighlightRange) {
-            if (d->highlightRange == StrictlyEnforceRange) {
-                if (trackedPos > pos + highlightEnd - d->trackedItem->size())
-                    pos = trackedPos - highlightEnd + d->trackedItem->size();
-                if (trackedPos < pos + highlightStart)
-                    pos = trackedPos - highlightStart;
-            } else {
-                if (trackedPos > pos + highlightEnd - trackedSize)
-                    pos = trackedPos - highlightEnd + trackedSize;
-                if (trackedPos < pos + highlightStart)
-                    pos = trackedPos - highlightStart;
+            if (trackedPos > pos + d->highlightRangeEnd - trackedSize)
+                pos = trackedPos - d->highlightRangeEnd + trackedSize;
+            if (trackedPos < pos + d->highlightRangeStart)
+                pos = trackedPos - d->highlightRangeStart;
+            if (d->highlightRange != StrictlyEnforceRange) {
                 if (pos > d->endPosition() - d->size())
                     pos = d->endPosition() - d->size();
                 if (pos < d->startPosition())
@@ -967,10 +951,8 @@ qreal QSGItemView::minXExtent() const
                 endPositionFirstItem = d->positionAt(d->model->count()-1);
             else if (d->header)
                 d->minExtent += d->headerSize();
-            highlightStart = d->highlightRangeStartValid
-                    ? d->highlightRangeStart - (d->lastPosition()-endPositionFirstItem)
-                    : d->size() - (d->lastPosition()-endPositionFirstItem);
-            highlightEnd = d->highlightRangeEndValid ? d->highlightRangeEnd : d->size();
+            highlightStart = d->highlightRangeEndValid ? d->size() - d->highlightRangeEnd : d->size();
+            highlightEnd = d->highlightRangeStartValid ? d->size() - d->highlightRangeStart : d->size();
             if (d->footer)
                 d->minExtent += d->footerSize();
             qreal maxX = maxXExtent();
@@ -986,7 +968,9 @@ qreal QSGItemView::minXExtent() const
         }
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
             d->minExtent += highlightStart;
-            d->minExtent = qMax(d->minExtent, -(endPositionFirstItem - highlightEnd));
+            d->minExtent = d->isContentFlowReversed()
+                                ? qMin(d->minExtent, endPositionFirstItem + highlightEnd)
+                                : qMax(d->minExtent, -(endPositionFirstItem - highlightEnd));
         }
         d->hData.minExtentDirty = false;
     }
@@ -1006,8 +990,8 @@ qreal QSGItemView::maxXExtent() const
         qreal lastItemPosition = 0;
         d->maxExtent = 0;
         if (d->isContentFlowReversed()) {
-            highlightStart = d->highlightRangeStartValid ? d->highlightRangeEnd : d->size();
-            highlightEnd = d->highlightRangeEndValid ? d->highlightRangeStart : d->size();
+            highlightStart = d->highlightRangeEndValid ? d->size() - d->highlightRangeEnd : d->size();
+            highlightEnd = d->highlightRangeStartValid ? d->size() - d->highlightRangeStart : d->size();
             lastItemPosition = d->endPosition();
         } else {
             highlightStart = d->highlightRangeStart;
diff --git a/src/declarative/items/qsglistview.cpp b/src/declarative/items/qsglistview.cpp
index 75472c2a79..5ea9efe274 100644
--- a/src/declarative/items/qsglistview.cpp
+++ b/src/declarative/items/qsglistview.cpp
@@ -1251,19 +1251,7 @@ void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
     fixupMode = moveReason == Mouse ? fixupMode : Immediate;
     bool strictHighlightRange = haveHighlightRange && highlightRange == QSGListView::StrictlyEnforceRange;
 
-    qreal highlightStart;
-    qreal highlightEnd;
-    qreal viewPos;
-    if (isRightToLeft()) {
-        // Handle Right-To-Left exceptions
-        viewPos = -position()-size();
-        highlightStart = highlightRangeStartValid ? size() - highlightRangeEnd : highlightRangeStart;
-        highlightEnd = highlightRangeEndValid ? size() - highlightRangeStart : highlightRangeEnd;
-    } else {
-        viewPos = position();
-        highlightStart = highlightRangeStart;
-        highlightEnd = highlightRangeEnd;
-    }
+    qreal viewPos = isRightToLeft() ? -position()-size() : position();
 
     if (snapMode != QSGListView::NoSnap && moveReason != QSGListViewPrivate::SetIndex) {
         qreal tempPosition = isRightToLeft() ? -position()-size() : position();
@@ -1279,13 +1267,13 @@ void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
                 bias = -bias;
             tempPosition -= bias;
         }
-        FxViewItem *topItem = snapItemAt(tempPosition+highlightStart);
+        FxViewItem *topItem = snapItemAt(tempPosition+highlightRangeStart);
         if (!topItem && strictHighlightRange && currentItem) {
             // StrictlyEnforceRange always keeps an item in range
             updateHighlight();
             topItem = currentItem;
         }
-        FxViewItem *bottomItem = snapItemAt(tempPosition+highlightEnd);
+        FxViewItem *bottomItem = snapItemAt(tempPosition+highlightRangeEnd);
         if (!bottomItem && strictHighlightRange && currentItem) {
             // StrictlyEnforceRange always keeps an item in range
             updateHighlight();
@@ -1294,19 +1282,19 @@ void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
         qreal pos;
         bool isInBounds = -position() > maxExtent && -position() <= minExtent;
         if (topItem && (isInBounds || strictHighlightRange)) {
-            if (topItem->index == 0 && header && tempPosition+highlightStart < header->position()+header->size()/2 && !strictHighlightRange) {
-                pos = isRightToLeft() ? - header->position() + highlightStart - size() : header->position() - highlightStart;
+            if (topItem->index == 0 && header && tempPosition+highlightRangeStart < header->position()+header->size()/2 && !strictHighlightRange) {
+                pos = isRightToLeft() ? - header->position() + highlightRangeStart - size() : header->position() - highlightRangeStart;
             } else {
                 if (isRightToLeft())
-                    pos = qMax(qMin(-topItem->position() + highlightStart - size(), -maxExtent), -minExtent);
+                    pos = qMax(qMin(-topItem->position() + highlightRangeStart - size(), -maxExtent), -minExtent);
                 else
-                    pos = qMax(qMin(topItem->position() - highlightStart, -maxExtent), -minExtent);
+                    pos = qMax(qMin(topItem->position() - highlightRangeStart, -maxExtent), -minExtent);
             }
         } else if (bottomItem && isInBounds) {
             if (isRightToLeft())
-                pos = qMax(qMin(-bottomItem->position() + highlightEnd - size(), -maxExtent), -minExtent);
+                pos = qMax(qMin(-bottomItem->position() + highlightRangeEnd - size(), -maxExtent), -minExtent);
             else
-                pos = qMax(qMin(bottomItem->position() - highlightEnd, -maxExtent), -minExtent);
+                pos = qMax(qMin(bottomItem->position() - highlightRangeEnd, -maxExtent), -minExtent);
         } else {
             QSGItemViewPrivate::fixup(data, minExtent, maxExtent);
             return;
@@ -1326,10 +1314,10 @@ void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
     } else if (currentItem && strictHighlightRange && moveReason != QSGListViewPrivate::SetIndex) {
         updateHighlight();
         qreal pos = static_cast<FxListItemSG*>(currentItem)->itemPosition();
-        if (viewPos < pos + static_cast<FxListItemSG*>(currentItem)->itemSize() - highlightEnd)
-            viewPos = pos + static_cast<FxListItemSG*>(currentItem)->itemSize() - highlightEnd;
-        if (viewPos > pos - highlightStart)
-            viewPos = pos - highlightStart;
+        if (viewPos < pos + static_cast<FxListItemSG*>(currentItem)->itemSize() - highlightRangeEnd)
+            viewPos = pos + static_cast<FxListItemSG*>(currentItem)->itemSize() - highlightRangeEnd;
+        if (viewPos > pos - highlightRangeStart)
+            viewPos = pos - highlightRangeStart;
         if (isRightToLeft())
             viewPos = -viewPos-size();
 
@@ -1364,7 +1352,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
     }
     qreal maxDistance = 0;
     qreal dataValue = isRightToLeft() ? -data.move.value()+size() : data.move.value();
-    qreal highlightStart = isRightToLeft() && highlightRangeStartValid ? size()-highlightRangeEnd : highlightRangeStart;
+
     // -ve velocity means list is moving up/left
     if (velocity > 0) {
         if (data.move.value() < minExtent) {
@@ -1374,7 +1362,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
                 qreal bias = dist < averageSize/2 ? averageSize/2 : 0;
                 if (isRightToLeft())
                     bias = -bias;
-                data.flickTarget = -snapPosAt(-(dataValue - highlightStart) - bias) + highlightStart;
+                data.flickTarget = -snapPosAt(-(dataValue - highlightRangeStart) - bias) + highlightRangeStart;
                 maxDistance = qAbs(data.flickTarget - data.move.value());
                 velocity = maxVelocity;
             } else {
@@ -1391,7 +1379,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
                 qreal bias = -dist < averageSize/2 ? averageSize/2 : 0;
                 if (isRightToLeft())
                     bias = -bias;
-                data.flickTarget = -snapPosAt(-(dataValue - highlightStart) + bias) + highlightStart;
+                data.flickTarget = -snapPosAt(-(dataValue - highlightRangeStart) + bias) + highlightRangeStart;
                 maxDistance = qAbs(data.flickTarget - data.move.value());
                 velocity = -maxVelocity;
             } else {
@@ -1428,7 +1416,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
             if ((maxDistance > 0.0 && v2 / (2.0f * maxDistance) < accel) || snapMode == QSGListView::SnapOneItem) {
                 if (snapMode != QSGListView::SnapOneItem) {
                     qreal distTemp = isRightToLeft() ? -dist : dist;
-                    data.flickTarget = -snapPosAt(-(dataValue - highlightStart) + distTemp) + highlightStart;
+                    data.flickTarget = -snapPosAt(-(dataValue - highlightRangeStart) + distTemp) + highlightRangeStart;
                 }
                 data.flickTarget = isRightToLeft() ? -data.flickTarget+size() : data.flickTarget;
                 if (overShoot) {
@@ -1484,7 +1472,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
             qreal newtarget = data.flickTarget;
             if (snapMode != QSGListView::NoSnap || highlightRange == QSGListView::StrictlyEnforceRange) {
                 qreal tempFlickTarget = isRightToLeft() ? -data.flickTarget+size() : data.flickTarget;
-                newtarget = -snapPosAt(-(tempFlickTarget - highlightStart)) + highlightStart;
+                newtarget = -snapPosAt(-(tempFlickTarget - highlightRangeStart)) + highlightRangeStart;
                 newtarget = isRightToLeft() ? -newtarget+size() : newtarget;
             }
             if (velocity < 0 && newtarget <= maxExtent)
@@ -2167,23 +2155,11 @@ void QSGListView::viewportMoved()
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
             // reposition highlight
             qreal pos = d->highlight->position();
-            qreal viewPos;
-            qreal highlightStart;
-            qreal highlightEnd;
-            if (d->isRightToLeft()) {
-                // Handle Right-To-Left exceptions
-                viewPos = -d->position()-d->size();
-                highlightStart = d->highlightRangeStartValid ? d->size()-d->highlightRangeEnd : d->highlightRangeStart;
-                highlightEnd = d->highlightRangeEndValid ? d->size()-d->highlightRangeStart : d->highlightRangeEnd;
-            } else {
-                viewPos = d->position();
-                highlightStart = d->highlightRangeStart;
-                highlightEnd = d->highlightRangeEnd;
-            }
-            if (pos > viewPos + highlightEnd - d->highlight->size())
-                pos = viewPos + highlightEnd - d->highlight->size();
-            if (pos < viewPos + highlightStart)
-                pos = viewPos + highlightStart;
+            qreal viewPos = d->isRightToLeft() ? -d->position()-d->size() : d->position();
+            if (pos > viewPos + d->highlightRangeEnd - d->highlight->size())
+                pos = viewPos + d->highlightRangeEnd - d->highlight->size();
+            if (pos < viewPos + d->highlightRangeStart)
+                pos = viewPos + d->highlightRangeStart;
             if (pos != d->highlight->position()) {
                 d->highlightPosAnimator->stop();
                 static_cast<FxListItemSG*>(d->highlight)->setPosition(pos);
diff --git a/src/qtquick1/graphicsitems/qdeclarativegridview.cpp b/src/qtquick1/graphicsitems/qdeclarativegridview.cpp
index feabbf0387..2ed1ca1782 100644
--- a/src/qtquick1/graphicsitems/qdeclarativegridview.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativegridview.cpp
@@ -1095,23 +1095,17 @@ void QDeclarative1GridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal
             bottomItem = currentItem;
         }
         qreal pos;
-        if (topItem && bottomItem && strictHighlightRange) {
-            qreal topPos = qMin(topItem->rowPos() - highlightStart, -maxExtent);
-            qreal bottomPos = qMax(bottomItem->rowPos() - highlightEnd, -minExtent);
-            pos = qAbs(data.move + topPos) < qAbs(data.move + bottomPos) ? topPos : bottomPos;
-        } else if (topItem) {
-            qreal headerPos = 0;
-            if (header)
-                headerPos = isRightToLeftTopToBottom() ? header->rowPos() + cellWidth - headerSize() : header->rowPos();
-            if (topItem->index == 0 && header && tempPosition+highlightStart < headerPos+headerSize()/2 && !strictHighlightRange) {
-                pos = isRightToLeftTopToBottom() ? - headerPos + highlightStart - size() : headerPos - highlightStart;
+        bool isInBounds = -position() > maxExtent && -position() <= minExtent;
+        if (topItem && (isInBounds || strictHighlightRange)) {
+            if (topItem->index == 0 && header && tempPosition+highlightStart < header->rowPos()+headerSize()/2 && !strictHighlightRange) {
+                pos = isRightToLeftTopToBottom() ? - header->rowPos() + highlightStart - size() : header->rowPos() - highlightStart;
             } else {
                 if (isRightToLeftTopToBottom())
                     pos = qMax(qMin(-topItem->rowPos() + highlightStart - size(), -maxExtent), -minExtent);
                 else
                     pos = qMax(qMin(topItem->rowPos() - highlightStart, -maxExtent), -minExtent);
             }
-        } else if (bottomItem) {
+        } else if (bottomItem && isInBounds) {
             if (isRightToLeftTopToBottom())
                 pos = qMax(qMin(-bottomItem->rowPos() + highlightEnd - size(), -maxExtent), -minExtent);
             else
@@ -2267,9 +2261,10 @@ qreal QDeclarative1GridView::minXExtent() const
     qreal extent = -d->startPosition();
     qreal highlightStart;
     qreal highlightEnd;
-    qreal endPositionFirstItem;
+    qreal endPositionFirstItem = 0;
     if (d->isRightToLeftTopToBottom()) {
-        endPositionFirstItem = d->rowPosAt(d->model->count()-1);
+        if (d->model && d->model->count())
+            endPositionFirstItem = d->rowPosAt(d->model->count()-1);
         highlightStart = d->highlightRangeStartValid
                 ? d->highlightRangeStart - (d->lastPosition()-endPositionFirstItem)
                 : d->size() - (d->lastPosition()-endPositionFirstItem);
@@ -2284,7 +2279,7 @@ qreal QDeclarative1GridView::minXExtent() const
             extent += d->header->item->width();
     }
     if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
-        extent += highlightStart;
+        extent += d->isRightToLeftTopToBottom() ? -highlightStart : highlightStart;
         extent = qMax(extent, -(endPositionFirstItem - highlightEnd));
     }
     return extent;
diff --git a/src/qtquick1/graphicsitems/qdeclarativelistview.cpp b/src/qtquick1/graphicsitems/qdeclarativelistview.cpp
index 7b9cb12e90..6430f6a071 100644
--- a/src/qtquick1/graphicsitems/qdeclarativelistview.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativelistview.cpp
@@ -2773,7 +2773,7 @@ qreal QDeclarative1ListView::minXExtent() const
                 d->minExtent += d->header->size();
         }
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
-            d->minExtent += highlightStart;
+            d->minExtent += d->isRightToLeft() ? -highlightStart : highlightStart;
             d->minExtent = qMax(d->minExtent, -(endPositionFirstItem - highlightEnd + 1));
         }
         d->minExtentDirty = false;