diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-04 14:35:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-04 14:35:58 (GMT) |
| commit | 0a5d51aaf95524d6c5933404f0e5ab9b331d4084 (patch) | |
| tree | a9d62202f165f68a87fbef364f45a0683132484d /src | |
| parent | 1d7d827eca37bafe5bfff5ab6bad0056beac9d5d (diff) | |
| parent | 57993ba7a181c92acfa8a0213ed1260c3b85fbd4 (diff) | |
| download | Qt-0a5d51aaf95524d6c5933404f0e5ab9b331d4084.zip Qt-0a5d51aaf95524d6c5933404f0e5ab9b331d4084.tar.gz Qt-0a5d51aaf95524d6c5933404f0e5ab9b331d4084.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix horizontal center alignment with trailing space
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 4b3c9e7..0fbf838 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -76,7 +76,7 @@ static QFixed alignLine(QTextEngine *eng, const QScriptLine &line) if (align & Qt::AlignRight) x = line.width - (line.textAdvance + eng->leadingSpaceWidth(line)); else if (align & Qt::AlignHCenter) - x = (line.width - line.textAdvance)/2; + x = (line.width - (line.textAdvance))/2 - eng->leadingSpaceWidth(line); } return x; } |