diff options
| author | Michael Brasser <michael.brasser@live.com> | 2016-06-13 16:52:22 -0500 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2016-06-16 13:50:33 +0000 |
| commit | 6358e1365539d2ea26ec20617b58c0fed11d647e (patch) | |
| tree | 88a9949f0b6c9128509f30477058896fb7e4da6e /src/quick/util/qquickstyledtext_p.h | |
| parent | 458b4f0d37955b44c4f129541df2203cb8426296 (diff) | |
Fix positioning of inline images in StyledText.
Fix horizontal positioning generally, and also address RTL specifically.
Change-Id: I8b75c11bc38e39da5cda302ee9b475bf0dc464e8
Task-number: QTBUG-54075
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/quick/util/qquickstyledtext_p.h')
| -rw-r--r-- | src/quick/util/qquickstyledtext_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/util/qquickstyledtext_p.h b/src/quick/util/qquickstyledtext_p.h index cd6710ff26..d9f1a71739 100644 --- a/src/quick/util/qquickstyledtext_p.h +++ b/src/quick/util/qquickstyledtext_p.h @@ -62,7 +62,7 @@ class Q_AUTOTEST_EXPORT QQuickStyledTextImgTag { public: QQuickStyledTextImgTag() - : position(0), align(QQuickStyledTextImgTag::Bottom), pix(0) + : position(0), offset(0.0), align(QQuickStyledTextImgTag::Bottom), pix(0) { } ~QQuickStyledTextImgTag() { delete pix; } @@ -77,6 +77,7 @@ public: QPointF pos; QSize size; int position; + qreal offset; // this offset allows us to compensate for flooring reserved space Align align; QQuickPixmap *pix; }; |