diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-11 11:56:38 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-18 12:00:48 +0000 |
commit | f52025af7a1c62f4c0f580c39ce255a798e91655 (patch) | |
tree | 9963ca74a30f28ec2367a4e0201e27a8f2f502d7 /src/quick/items/qquickpositioners_p_p.h | |
parent | a8d532eb1d46cb4487988df939a176f662c7a1af (diff) |
Column, Row, Grid, Flow: add support for padding
[ChangeLog][QtQuick] Added padding, leftPadding, topPadding,
rightPadding and bottomPadding properties in Positioners,
including Column, Row, Grid and Flow.
Task-number: QTBUG-41559
Change-Id: If3be7b2243a79c01dad0a5600e22d30eeea43c8a
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquickpositioners_p_p.h')
-rw-r--r-- | src/quick/items/qquickpositioners_p_p.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/quick/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h index 3a8fe20351..a58f79ac0a 100644 --- a/src/quick/items/qquickpositioners_p_p.h +++ b/src/quick/items/qquickpositioners_p_p.h @@ -69,6 +69,16 @@ public: : spacing(0), type(QQuickBasePositioner::None) , transitioner(0), positioningDirty(false) , doingPositioning(false), anchorConflict(false), layoutDirection(Qt::LeftToRight) + , padding(0) + , topPadding(0) + , leftPadding(0) + , rightPadding(0) + , bottomPadding(0) + , explicitTopPadding(false) + , explicitLeftPadding(false) + , explicitRightPadding(false) + , explicitBottomPadding(false) + { } @@ -98,6 +108,16 @@ public: Qt::LayoutDirection layoutDirection; + qreal padding; + qreal topPadding; + qreal leftPadding; + qreal rightPadding; + qreal bottomPadding; + bool explicitTopPadding; + bool explicitLeftPadding; + bool explicitRightPadding; + bool explicitBottomPadding; + void mirrorChange() Q_DECL_OVERRIDE { effectiveLayoutDirectionChange(); } @@ -149,6 +169,11 @@ public: virtual void effectiveLayoutDirectionChange() { } + + void setTopPadding(qreal value, bool reset = false); + void setLeftPadding(qreal value, bool reset = false); + void setRightPadding(qreal value, bool reset = false); + void setBottomPadding(qreal value, bool reset = false); }; QT_END_NAMESPACE |