diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/Fix-cursor-truncate-to-include-line-position.patch | 32 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/Fix-cursor-truncate-to-include-line-position.patch b/debian/patches/Fix-cursor-truncate-to-include-line-position.patch new file mode 100644 index 0000000..25d4a7a --- /dev/null +++ b/debian/patches/Fix-cursor-truncate-to-include-line-position.patch @@ -0,0 +1,32 @@ +Description: 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. + +Origin: commit ca89c49fa2c5cbb3945897046f33eed9f7da846c +Author: Jiang Jiang <jiang.jiang@nokia.com> +Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> +Applied-Upstream: yes +Forwarded: not-needed + +--- + 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.4 + diff --git a/debian/patches/series b/debian/patches/series index adb61a5..5522a5c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,7 @@ Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch QElfParser-fix-type-of-sh_size.patch +Fix-cursor-truncate-to-include-line-position.patch # qt-copy patches 0195-compositing-properties.diff |