From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Tue, 5 Feb 2013 21:52:29 +0000 (+0000)
Subject: Fix-cursor-truncate-to-include-line-position
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-15+rpi1~1^2^2^2~47
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=88bc2251555d5c92bb384a91cb28ad9d774bba0d;p=qt4-x11.git

Fix-cursor-truncate-to-include-line-position

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


Gbp-Pq: Name Fix-cursor-truncate-to-include-line-position.patch
---

diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 16f715027..52f279357 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();