aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2012-01-23 13:58:22 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-24 23:18:10 +0100
commit49212ef6d8934a023e6d0a7b778ec25605a8be7a (patch)
tree0abc303d9b7fa21a4c44ce60de034dd623e75589
parent7412dc96c6b7cc1a196c4afb06e8b51f7ee04f44 (diff)
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>
-rw-r--r--src/quick/items/qquickgridview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 133571515a..594bbce220 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;