diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-06-01 17:40:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-06-01 17:40:53 (GMT) |
| commit | 5c6e671c8cbab281af4685d3698790ab566ed2f2 (patch) | |
| tree | 0f3e15d12cf984d8f49c7adfaf056063cc726803 /src/gui/text/qtextlayout.cpp | |
| parent | 7165826d2e9ff77951a289c62746d6c87f725139 (diff) | |
| parent | 0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d (diff) | |
| download | Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.zip Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.gz Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 94d9d67..412c909 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -858,7 +858,8 @@ QRectF QTextLayout::boundingRect() const const QScriptLine &si = d->lines[i]; xmin = qMin(xmin, si.x); ymin = qMin(ymin, si.y); - xmax = qMax(xmax, si.x+qMax(si.width, si.textWidth)); + QFixed lineWidth = si.width < QFIXED_MAX ? qMax(si.width, si.textWidth) : si.textWidth; + xmax = qMax(xmax, si.x+lineWidth); // ### shouldn't the ascent be used in ymin??? ymax = qMax(ymax, si.y+si.height()); } |