aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickpositioners_p_p.h
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2017-03-29 13:11:08 +0200
committerMitch Curtis <mitch.curtis@qt.io>2017-04-05 09:25:22 +0000
commit315f3689866adea143b064ade6a77d6e21bcc2e3 (patch)
tree941e86788f6189e93b0691252daa0dc2b6c96dca /src/quick/items/qquickpositioners_p_p.h
parentfa01610d6b4e4637cf48b0fcb9fd14d7c5522a77 (diff)
Revert "Positioners: allow distinguishing between implicit/explicit child size"
This reverts commit 2556bfdab42dc0aefb34bb7cf304063c7db0ff00. This is no longer necessary, as there are now no users of this functionality in other modules. Change-Id: If92bbdb3e5e95b4103610d68d22e929cf30c4e5e Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/quick/items/qquickpositioners_p_p.h')
-rw-r--r--src/quick/items/qquickpositioners_p_p.h41
1 files changed, 4 insertions, 37 deletions
diff --git a/src/quick/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h
index 1a7051615c..0be4c56df6 100644
--- a/src/quick/items/qquickpositioners_p_p.h
+++ b/src/quick/items/qquickpositioners_p_p.h
@@ -89,14 +89,10 @@ public:
QLazilyAllocated<ExtraData> extra;
QQuickBasePositionerPrivate()
- : spacing(0)
- , type(QQuickBasePositioner::None)
- , transitioner(0)
- , positioningDirty(false)
- , doingPositioning(false)
- , anchorConflict(false)
- , useImplicitSize(false)
- , layoutDirection(Qt::LeftToRight)
+ : spacing(0), type(QQuickBasePositioner::None)
+ , transitioner(0), positioningDirty(false)
+ , doingPositioning(false), anchorConflict(false), layoutDirection(Qt::LeftToRight)
+
{
}
@@ -123,7 +119,6 @@ public:
bool positioningDirty : 1;
bool doingPositioning : 1;
bool anchorConflict : 1;
- bool useImplicitSize : 1;
Qt::LayoutDirection layoutDirection;
@@ -179,34 +174,6 @@ public:
{
}
- void itemImplicitWidthChanged(QQuickItem *) override
- {
- Q_ASSERT(useImplicitSize);
- setPositioningDirty();
- }
-
- void itemImplicitHeightChanged(QQuickItem *) override
- {
- Q_ASSERT(useImplicitSize);
- setPositioningDirty();
- }
-
- qreal itemWidth(QQuickItem *item) const
- {
- if (Q_LIKELY(!useImplicitSize))
- return item->width();
-
- return item->implicitWidth();
- }
-
- qreal itemHeight(QQuickItem *item) const
- {
- if (Q_LIKELY(!useImplicitSize))
- return item->height();
-
- return item->implicitHeight();
- }
-
inline qreal padding() const { return extra.isAllocated() ? extra->padding : 0.0; }
void setTopPadding(qreal value, bool reset = false);
void setLeftPadding(qreal value, bool reset = false);