diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2010-06-05 20:11:57 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2010-06-09 22:07:58 (GMT) |
| commit | 7b0f00e8c8a4ec541dba510debcf786c7edb7fae (patch) | |
| tree | 4185569c55d8c53a3ee76782fb95759cc0c27327 /src/gui/text/qtextdocumentlayout.cpp | |
| parent | fee7f7d67f780b798a63994a1125f9ca3ade1bd3 (diff) | |
| download | Qt-7b0f00e8c8a4ec541dba510debcf786c7edb7fae.zip Qt-7b0f00e8c8a4ec541dba510debcf786c7edb7fae.tar.gz Qt-7b0f00e8c8a4ec541dba510debcf786c7edb7fae.tar.bz2 | |
Use the textDirection() of blocks correctly.
Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index eeb66ce..ff14490 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -1369,9 +1369,7 @@ void QTextDocumentLayoutPrivate::drawListItem(const QPointF &offset, QPainter *p QTextLine firstLine = layout->lineAt(0); Q_ASSERT(firstLine.isValid()); QPointF pos = (offset + layout->position()).toPoint(); - Qt::LayoutDirection dir = docPrivate->defaultTextOption.textDirection(); - if (blockFormat.hasProperty(QTextFormat::LayoutDirection)) - dir = blockFormat.layoutDirection(); + Qt::LayoutDirection dir = bl.textDirection(); { QRectF textRect = firstLine.naturalTextRect(); pos += textRect.topLeft().toPoint(); @@ -2530,9 +2528,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi //QTextFrameData *fd = data(layoutStruct->frame); - Qt::LayoutDirection dir = docPrivate->defaultTextOption.textDirection(); - if (blockFormat.hasProperty(QTextFormat::LayoutDirection)) - dir = blockFormat.layoutDirection(); + Qt::LayoutDirection dir = bl.textDirection(); QFixed extraMargin; if (docPrivate->defaultTextOption.flags() & QTextOption::AddSpaceForLineAndParagraphSeparators) { |