From f52025af7a1c62f4c0f580c39ce255a798e91655 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 11 May 2015 11:56:38 +0200 Subject: Column, Row, Grid, Flow: add support for padding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [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 --- src/quick/items/qquickpositioners_p_p.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/quick/items/qquickpositioners_p_p.h') 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 -- cgit v1.2.3