diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-08 13:22:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-15 09:30:59 +0000 |
| commit | 9eb4b013f9ceea1d667ddc47ee58a55a4efa5070 (patch) | |
| tree | b28094bf5ca38bf98e4b0982c605bfae4e9141a0 /src/quick/items/qquicktext_p_p.h | |
| parent | 7e895fc466d918844203c9dcdd46f64cd4dc7ec2 (diff) | |
QQuickText: move padding into extraData
Task-number: QTBUG-46529
Change-Id: Ifce670a59c367dc1b211ad2c7e797e3a7808cdb2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquicktext_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktext_p_p.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index 3c202056af..f0469fc8ea 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -87,14 +87,15 @@ public: struct ExtraData { ExtraData(); + qreal padding; qreal topPadding; qreal leftPadding; qreal rightPadding; qreal bottomPadding; - bool explicitTopPadding; - bool explicitLeftPadding; - bool explicitRightPadding; - bool explicitBottomPadding; + bool explicitTopPadding : 1; + bool explicitLeftPadding : 1; + bool explicitRightPadding : 1; + bool explicitBottomPadding : 1; qreal lineHeight; QQuickTextDocumentWithImageResources *doc; QString activeLink; @@ -119,7 +120,6 @@ public: QTextLayout *elideLayout; QQuickTextLine *textLine; - qreal padding; qreal lineWidth; QRgb color; @@ -171,6 +171,7 @@ public: qreal availableWidth() const; qreal availableHeight() const; + 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); void setRightPadding(qreal value, bool reset = false); |