diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-05 10:12:20 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-17 22:02:23 +0000 |
commit | 6ec2693d4a3c95ca9ff0c349d3c587a7f1402c05 (patch) | |
tree | f5166b307ef0f6c42e024757445b589ce68c5518 /src/quick/items/qquicktext_p_p.h | |
parent | 079c45fd0ab831dc91df34900ad9111a01b19a0d (diff) |
Text: add support for padding
[ChangeLog][QtQuick][Text] Added padding, leftPadding, topPadding,
rightPadding and bottomPadding properties.
Task-number: QTBUG-41559
Change-Id: I5aa3a9eaad86de5e49d8e2da2a9f583e9a17222b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquicktext_p_p.h')
-rw-r--r-- | src/quick/items/qquicktext_p_p.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index 9a6da3736e..6f954dd8c5 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -87,6 +87,14 @@ public: struct ExtraData { ExtraData(); + qreal topPadding; + qreal leftPadding; + qreal rightPadding; + qreal bottomPadding; + bool explicitTopPadding; + bool explicitLeftPadding; + bool explicitRightPadding; + bool explicitBottomPadding; qreal lineHeight; QQuickTextDocumentWithImageResources *doc; QString activeLink; @@ -111,6 +119,7 @@ public: QTextLayout *elideLayout; QQuickTextLine *textLine; + qreal padding; qreal lineWidth; QRgb color; @@ -159,6 +168,14 @@ public: qreal getImplicitWidth() const Q_DECL_OVERRIDE; qreal getImplicitHeight() const Q_DECL_OVERRIDE; + qreal availableWidth() const; + qreal availableHeight() const; + + 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); + void ensureDoc(); QRectF setupTextLayout(qreal * const baseline); |