diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2012-09-26 01:10:42 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:51:55 +0200 |
| commit | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch) | |
| tree | b428a16618e36ed864a8d76ea3435e19a452bf90 /source/l/qt/qt.ca89c49.cursor.position.diff | |
| parent | 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff) | |
| download | current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz | |
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!
We're perfectionists here at Slackware, so this release has been a long
time a-brewing. But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Thanks to everyone who helped make this happen. The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.
Have fun! :-)
Diffstat (limited to 'source/l/qt/qt.ca89c49.cursor.position.diff')
| -rw-r--r-- | source/l/qt/qt.ca89c49.cursor.position.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/source/l/qt/qt.ca89c49.cursor.position.diff b/source/l/qt/qt.ca89c49.cursor.position.diff new file mode 100644 index 00000000..ab3429f8 --- /dev/null +++ b/source/l/qt/qt.ca89c49.cursor.position.diff @@ -0,0 +1,31 @@ +From ca89c49fa2c5cbb3945897046f33eed9f7da846c Mon Sep 17 00:00:00 2001 +From: Jiang Jiang <jiang.jiang@nokia.com> +Date: Tue, 3 Jul 2012 10:17:49 +0200 +Subject: [PATCH] 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> +--- + src/gui/text/qtextlayout.cpp | 4 ++-- + 1 file 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(); +-- +1.7.10 |