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/items/qquicktext.cpp | |
| 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/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index aa8f04e55d..e67e2cee9c 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1138,7 +1138,10 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal foreach (QQuickStyledTextImgTag *image, imagesInLine) { totalLineHeight = qMax(totalLineHeight, textTop + image->pos.y() + image->size.height()); - image->pos.setX(line.cursorToX(image->position)); + const int leadX = line.cursorToX(image->position); + const int trailX = line.cursorToX(image->position, QTextLine::Trailing); + const bool rtl = trailX < leadX; + image->pos.setX(leadX + (rtl ? (-image->offset - image->size.width()) : image->offset)); image->pos.setY(image->pos.y() + height + textTop); extra->visibleImgTags << image; } |