diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
---|---|---|
committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /src/quick/items/qquickpositioners_p.h | |
parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'src/quick/items/qquickpositioners_p.h')
-rw-r--r-- | src/quick/items/qquickpositioners_p.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h index a2ad572c0e..8921bfa39b 100644 --- a/src/quick/items/qquickpositioners_p.h +++ b/src/quick/items/qquickpositioners_p.h @@ -43,6 +43,7 @@ #define QQUICKPOSITIONERS_P_H #include "qquickimplicitsizeitem_p.h" +#include "qquickitemviewtransition_p.h" #include <QtQuick/private/qquickstate_p.h> #include <private/qpodvector_p.h> @@ -96,6 +97,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeIte Q_PROPERTY(QQuickTransition *add READ add WRITE setAdd NOTIFY addChanged) public: enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 }; + QQuickBasePositioner(PositionerType, QQuickItem *parent); ~QQuickBasePositioner(); @@ -116,7 +118,6 @@ protected: QQuickBasePositioner(QQuickBasePositionerPrivate &dd, PositionerType at, QQuickItem *parent); virtual void componentComplete(); virtual void itemChange(ItemChange, const ItemChangeData &); - void finishApplyTransitions(); virtual void updatePolish(); @@ -131,19 +132,22 @@ protected Q_SLOTS: protected: virtual void doPositioning(QSizeF *contentSize)=0; virtual void reportConflictingAnchors()=0; - class PositionedItem { + + class PositionedItem : public QQuickViewItem + { public : - PositionedItem(QQuickItem *i) : item(i), isNew(false), isVisible(true) {} + PositionedItem(QQuickItem *i) : QQuickViewItem(i), isNew(false), isVisible(true) {} bool operator==(const PositionedItem &other) const { return other.item == item; } - QQuickItem *item; + bool isNew; bool isVisible; }; QPODVector<PositionedItem,8> positionedItems; QPODVector<PositionedItem,8> unpositionedItems;//Still 'in' the positioner, just not positioned - void positionX(qreal,const PositionedItem &target); - void positionY(qreal,const PositionedItem &target); + void positionItem(qreal x, qreal y, PositionedItem *target); + void positionItemX(qreal, PositionedItem *target); + void positionItemY(qreal, PositionedItem *target); private: Q_DISABLE_COPY(QQuickBasePositioner) |