diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-06-29 17:06:38 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 05:24:45 +0200 |
| commit | aeac9840e4c46786e84ab7eb16a89db22d4ff81a (patch) | |
| tree | 2aaae5a3dccfa9ee447f0896a659cc60caba5b86 /src/quick/items/qquickanchors_p_p.h | |
| parent | ea9c14f3e1a42080be03d95b825a7ba8ed303bbc (diff) | |
Allow all explicit margins to override margins.
Task-number: QTBUG-24515
Change-Id: Ibfc657dec9fd0c8e71cf3686a04ea7b00ad72c11
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/items/qquickanchors_p_p.h')
| -rw-r--r-- | src/quick/items/qquickanchors_p_p.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/quick/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h index 0fdcd1540c..c641745577 100644 --- a/src/quick/items/qquickanchors_p_p.h +++ b/src/quick/items/qquickanchors_p_p.h @@ -92,10 +92,13 @@ class QQuickAnchorsPrivate : public QObjectPrivate, public QQuickItemChangeListe Q_DECLARE_PUBLIC(QQuickAnchors) public: QQuickAnchorsPrivate(QQuickItem *i) - : componentComplete(true), updatingMe(false), inDestructor(false), centerAligned(true), updatingHorizontalAnchor(0), + : componentComplete(true), updatingMe(false), inDestructor(false), centerAligned(true), + leftMarginExplicit(false), rightMarginExplicit(false), topMarginExplicit(false), + bottomMarginExplicit(false), updatingHorizontalAnchor(0), updatingVerticalAnchor(0), updatingFill(0), updatingCenterIn(0), item(i), usedAnchors(0), fill(0), centerIn(0), leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0), margins(0), vCenterOffset(0), hCenterOffset(0), baselineOffset(0) + { } @@ -110,6 +113,10 @@ public: bool updatingMe:1; bool inDestructor:1; bool centerAligned:1; + bool leftMarginExplicit : 1; + bool rightMarginExplicit : 1; + bool topMarginExplicit : 1; + bool bottomMarginExplicit : 1; uint updatingHorizontalAnchor:2; uint updatingVerticalAnchor:2; uint updatingFill:2; @@ -165,6 +172,7 @@ public: qreal hCenterOffset; qreal baselineOffset; + static inline QQuickAnchorsPrivate *get(QQuickAnchors *o) { return static_cast<QQuickAnchorsPrivate *>(QObjectPrivate::get(o)); } |