diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-07-03 08:17:49 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 23:46:53 (GMT) |
| commit | ca89c49fa2c5cbb3945897046f33eed9f7da846c (patch) | |
| tree | ff2d6ceb288d1fa0295d83c9928fe7965093a813 | |
| parent | 468656296b79ab2c87fd9ddf10b9f3bdf8ce67c0 (diff) | |
| download | Qt-ca89c49fa2c5cbb3945897046f33eed9f7da846c.zip Qt-ca89c49fa2c5cbb3945897046f33eed9f7da846c.tar.gz Qt-ca89c49fa2c5cbb3945897046f33eed9f7da846c.tar.bz2 | |
Fix cursor truncate to include line position
Since we could have moved the line position (QTextLine::setPosition),
the truncating position should be adjusted with that.
Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 16f7150..52f2793 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const x += eng->offsetInLigature(si, pos, end, glyph_pos); } - if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width) - x = line.width; + if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width) + x = line.x + line.width; *cursorPos = pos + si->position; return x.toReal(); |