diff options
author | Martin Jones <martin.jones@nokia.com> | 2012-02-23 16:57:06 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 02:43:19 +0100 |
commit | 15dac112df4f44ba8b15047720e1570fd4096f26 (patch) | |
tree | 1aa1f1fe0caec4d8a3a24db4ec7fa59fd39c7555 /src/quick/items/qquickitemview_p_p.h | |
parent | d2921ffc52fed380326f8abb86d6d659cc47f9d1 (diff) |
Don't create a separate section header for currentItem
The currentItem FxViewItem contained it's own section item,
which when created would cause the current item delegate
to be repositioned. This change associates the section item
with the delegate item, via the attached object.
Change-Id: Ie675d545539b56d0f1cf5a9b4ea26668978a5e72
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
-rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 05927c0d68..fce6e4eba5 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -117,15 +117,15 @@ public: QQuickItem *item; bool ownItem; - int index; bool releaseAfterTransition; + bool isTransitionTarget; + bool nextTransitionToSet; + int index; QQuickItemViewAttached *attached; FxViewItemTransitionManager *transition; QPointF nextTransitionTo; FxViewItemTransitionManager::TransitionType nextTransitionType; - bool isTransitionTarget; - bool nextTransitionToSet; protected: void moveTo(const QPointF &pos); @@ -225,7 +225,7 @@ public: void mirrorChange(); FxViewItem *createItem(int modelIndex, bool asynchronous = false); - virtual void releaseItem(FxViewItem *item); + virtual bool releaseItem(FxViewItem *item); QQuickItem *createHighlightItem(); QQuickItem *createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault = false); |