diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2013-11-04 17:08:47 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:57:36 +0200 |
commit | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (patch) | |
tree | 9b98e6e193c7870cb27ac861394c1c4592850922 /source/l/qt/qt.ca89c49.cursor.position.diff | |
parent | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (diff) | |
download | current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.gz |
Slackware 14.1slackware-14.1
Mon Nov 4 17:08:47 UTC 2013
Slackware 14.1 x86_64 stable is released!
It's been another interesting release cycle here at Slackware bringing
new features like support for UEFI machines, updated compilers and
development tools, the switch from MySQL to MariaDB, and many more
improvements throughout the system. Thanks to the team, the upstream
developers, the dedicated Slackware community, and everyone else who
pitched in to help make this release a reality.
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.
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, 0 insertions, 31 deletions
diff --git a/source/l/qt/qt.ca89c49.cursor.position.diff b/source/l/qt/qt.ca89c49.cursor.position.diff deleted file mode 100644 index ab3429f8..00000000 --- a/source/l/qt/qt.ca89c49.cursor.position.diff +++ /dev/null @@ -1,31 +0,0 @@ -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 |