diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 10:44:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 10:44:09 (GMT) |
| commit | 636698a5f97401a9aeb18cd690d7f08b05dcd5e6 (patch) | |
| tree | 65050b764e1aeb3f002cd929ce443cb26ff98a2a /src/gui/text | |
| parent | 8d8566d061e26f18e1bde1255fdc1375035c8eaa (diff) | |
| parent | 975b1913e44128a3e9b9055f9bf2ff40d86adf2a (diff) | |
| download | Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.zip Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.tar.gz Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix RightBearing confusion in text layout
fixes, improvements for various docs and example code
Fixed debugger's evaluation of dynamic properties in context
Allow test to pass on smaller screens (eg. 480 high).
Minor animation doc improvement
Diffstat (limited to 'src/gui/text')
| -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 d6535ea..674064e 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1935,7 +1935,7 @@ void QTextLine::layout_helper(int maxGlyphs) // We ignore the right bearing if the minimum negative bearing is too little to // expand the text beyond the edge. if (sb_or_ws|breakany) { - if (lbh.calculateNewWidth(line) + lbh.minimumRightBearing > line.width) + if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width) lbh.adjustRightBearing(); if (lbh.checkFullOtherwiseExtend(line)) { if (!breakany) { |