diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-06-14 15:11:54 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 12:47:31 +0200 |
commit | 530b773dfcd2dddeb824cb2a2c7fe1778e5c7985 (patch) | |
tree | 6f129e793fb1faa095d19812eff9f2a3834a69c3 /src/quick/items/qquickitemview_p_p.h | |
parent | 9e686c502be0b68f39836f29027a58466cb517b7 (diff) |
Fix crash when dragging items outside visible area.
If asynchronous item creation finishes while the content area of a
ListView has been dragged full outside the visible area a full refill
is triggered which can overwrite the requested index and potentially
result in a single delegate item being assigned to multiple view items
and later being doubly released. Only create the view item object in
the createItem function to prevent this from happening.
Secondly only reset the visible items if jumping outside the buffer
range rather than just the fill range to prevent churn when the list
only contains buffered items.
Task-number: QTBUG-26232
Change-Id: I5bce845898ef5f699f34afc268594ef38e01d6a3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
-rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index f68baf20f2..b580181c15 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -264,7 +264,6 @@ public: FxViewItem *trackedItem; QHash<QQuickItem*,int> unrequestedItems; int requestedIndex; - FxViewItem *requestedItem; QQuickItemViewChangeSet currentChanges; QQuickItemViewChangeSet bufferedChanges; QPauseAnimationJob bufferPause; @@ -305,7 +304,6 @@ public: bool highlightRangeEndValid : 1; bool fillCacheBuffer : 1; bool inRequest : 1; - bool requestedAsync : 1; bool runDelayedRemoveTransition : 1; protected: @@ -331,7 +329,7 @@ protected: virtual void setPosition(qreal pos) = 0; virtual void fixupPosition() = 0; - virtual bool addVisibleItems(qreal fillFrom, qreal fillTo, bool doBuffer) = 0; + virtual bool addVisibleItems(qreal fillFrom, qreal fillTo, qreal bufferFrom, qreal bufferTo, bool doBuffer) = 0; virtual bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) = 0; virtual void visibleItemsChanged() {} |