StrictlyEnforceRange should not override valid SnapOne decisions

The changes made in 134d980a7fcf61c5440019bcfb3fdfc39c3f5f3c and
2b779fbd25aaf09897ee2cdc4edffd12a980420b were still a bit too broad.
Tighten the condition further so original behavior is restored
for smaller to medium drags.

Change-Id: I9006e9cea80c1ef79e0b8d6a47b2a497532bef57
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 0886d358c3..6fcd846423 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -925,13 +925,13 @@ void QQuickGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExte
             tempPosition -= bias;
         }
         FxViewItem *topItem = snapItemAt(tempPosition+highlightRangeStart);
-        if (strictHighlightRange && currentItem && (!topItem || topItem->index != currentIndex)) {
+        if (strictHighlightRange && currentItem && (!topItem || (topItem->index != currentIndex && fixupMode == Immediate))) {
             // StrictlyEnforceRange always keeps an item in range
             updateHighlight();
             topItem = currentItem;
         }
         FxViewItem *bottomItem = snapItemAt(tempPosition+highlightRangeEnd);
-        if (strictHighlightRange && currentItem && (!bottomItem || bottomItem->index != currentIndex)) {
+        if (strictHighlightRange && currentItem && (!bottomItem || (bottomItem->index != currentIndex && fixupMode == Immediate))) {
             // StrictlyEnforceRange always keeps an item in range
             updateHighlight();
             bottomItem = currentItem;