From f85819fe083ae7c6804c884de68e906d153a6d11 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 12 Sep 2011 09:42:51 +1000
Subject: StrictlyEnforceRange with snapOneItem/Row and header behavior change

Change cf23188de237009136fa1480ab8fd9e3ca364769 changed the positioning
of a view with StrictlyEnforceRange, snapOneItem/Row, and a header,
such that the view was positioned at the beginning of the header,
rather than on the first item.  This change reverts back to the old
behavior (position on the first item).

Change-Id: I62ad183919bb2ed83d787d1d76421caf9e708599
Task-number: QTTH-1501
Reviewed-by: Michael Brasser
---
 src/declarative/graphicsitems/qdeclarativegridview.cpp | 6 ++++--
 src/declarative/graphicsitems/qdeclarativelistview.cpp | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 59e4cbb..5a5b60e 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1064,6 +1064,8 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         highlightEnd = highlightRangeEnd;
     }
 
+    bool strictHighlightRange = haveHighlightRange && highlightRange == QDeclarativeGridView::StrictlyEnforceRange;
+
     if (snapMode != QDeclarativeGridView::NoSnap) {
         qreal tempPosition = isRightToLeftTopToBottom() ? -position()-size() : position();
         if (snapMode == QDeclarativeGridView::SnapOneRow && moveReason == Mouse) {
@@ -1081,7 +1083,7 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         FxGridItem *topItem = snapItemAt(tempPosition+highlightStart);
         FxGridItem *bottomItem = snapItemAt(tempPosition+highlightEnd);
         qreal pos;
-        if (topItem && bottomItem && haveHighlightRange && highlightRange == QDeclarativeGridView::StrictlyEnforceRange) {
+        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;
@@ -1089,7 +1091,7 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
             qreal headerPos = 0;
             if (header)
                 headerPos = isRightToLeftTopToBottom() ? header->rowPos() + cellWidth - headerSize() : header->rowPos();
-            if (topItem->index == 0 && header && tempPosition+highlightStart < headerPos+headerSize()/2) {
+            if (topItem->index == 0 && header && tempPosition+highlightStart < headerPos+headerSize()/2 && !strictHighlightRange) {
                 pos = isRightToLeftTopToBottom() ? - headerPos + highlightStart - size() : headerPos - highlightStart;
             } else {
                 if (isRightToLeftTopToBottom())
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 57b7dea..70be7a7 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1293,6 +1293,7 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
 
     correctFlick = false;
     fixupMode = moveReason == Mouse ? fixupMode : Immediate;
+    bool strictHighlightRange = haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange;
 
     qreal highlightStart;
     qreal highlightEnd;
@@ -1325,9 +1326,9 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         FxListItem *topItem = snapItemAt(tempPosition+highlightStart);
         FxListItem *bottomItem = snapItemAt(tempPosition+highlightEnd);
         qreal pos;
-        bool isInBounds = -position() > maxExtent && -position() < minExtent;
+        bool isInBounds = -position() > maxExtent && -position() <= minExtent;
         if (topItem && isInBounds) {
-            if (topItem->index == 0 && header && tempPosition+highlightStart < header->position()+header->size()/2) {
+            if (topItem->index == 0 && header && tempPosition+highlightStart < header->position()+header->size()/2 && !strictHighlightRange) {
                 pos = isRightToLeft() ? - header->position() + highlightStart - size() : header->position() - highlightStart;
             } else {
                 if (isRightToLeft())
@@ -1356,7 +1357,7 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
             }
             vTime = timeline.time();
         }
-    } else if (currentItem && haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange
+    } else if (currentItem && strictHighlightRange
                 && moveReason != QDeclarativeListViewPrivate::SetIndex) {
         updateHighlight();
         qreal pos = currentItem->itemPosition();
-- 
cgit v0.12