From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 23 Jan 2012 03:58:22 +0000 (+1000)
Subject: Fixed crash in QDeclarativeGridView
X-Git-Tag: upstream/5.2.1~2823
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49212ef6d8934a023e6d0a7b778ec25605a8be7a;p=platform%2Fupstream%2Fqtdeclarative.git

Fixed crash in QDeclarativeGridView

Inserting new items used a different threshold than removing items
outside the view in refill.

Change-Id: I3712837820a1e1a6af280d33d29bd9e01e559691
Reviewed-by: Bea Lam <bea.lam@nokia.com>
---

diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 1335715..594bbce 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1863,7 +1863,7 @@ bool QQuickGridViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::In
     } else {
         int i = 0;
         int to = buffer+tempPos+size()-1;
-        while (i < count && rowPos <= to + rowSize()*(columns - (colPos/colSize()))/qreal(columns)) {
+        while (i < count && rowPos <= to + rowSize()*(columns - colNum)/qreal(columns+1)) {
             FxViewItem *item = 0;
             if (change.isMove() && (item = currentChanges.removedItems.take(change.moveKey(modelIndex + i))))
                 item->index = modelIndex + i;