From 48904cc5a1bfb1b80182fb36e140c9bb48ffb22d Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 28 Aug 2017 12:05:35 +0200
Subject: [PATCH] Fix computation of string width when using a QTextLayout

It was not a good idea to rely on QTextLine::naturalTextWidth() to
compute a string width. The correct method is horizontalAdvance().

Also round the value to the nearest pixel, since this is what
QFontMetrics::width() does.

By contrast with the code in 2.3.x/master, this code had to be adapted
for Qt < 4.7, where horizontalAdvance() is not defined and
naturalTextWidth() has to be used instead. The fix is thus only
effective starting from Qt 4.7.

Fixes bug #10700 (and maybe others).

(cherry picked from commit c874641e95b763a6d4691fb12fba893580f3018a)
---
 src/frontends/qt4/GuiFontMetrics.cpp | 17 +++++++++++++----
 status.22x                           |  4 +++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp
index fbaef2aac8..d94832f4df 100644
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -23,6 +23,7 @@
 
 #include "support/convert.h"
 #include "support/lassert.h"
+#include "support/lyxlib.h"
 
 #include <QByteArray>
 
@@ -198,7 +199,11 @@ int GuiFontMetrics::width(docstring const & s) const
 		tl.beginLayout();
 		QTextLine line = tl.createLine();
 		tl.endLayout();
-		w = int(line.naturalTextWidth());
+#if QT_VERSION >= 0x040700
+		w = iround(line.horizontalAdvance());
+#else
+		w = iround(line.naturalTextWidth());
+#endif
 	}
 	strwidth_cache_.insert(s, w, s.size() * sizeof(char_type));
 	return w;
@@ -363,7 +368,12 @@ GuiFontMetrics::breakAt_helper(docstring const & s, int const x,
 	line.setLineWidth(x);
 	tl.createLine();
 	tl.endLayout();
-	if ((force && line.textLength() == offset) || int(line.naturalTextWidth()) > x)
+#if QT_VERSION >= 0x040700
+	int const line_wid = iround(line.horizontalAdvance());
+#else
+	int const line_wid = iround(line.naturalTextWidth());
+#endif
+	if ((force && line.textLength() == offset) || line_wid > x)
 		return make_pair(-1, -1);
 	/* Since QString is UTF-16 and docstring is UCS-4, the offsets may
 	 * not be the same when there are high-plan unicode characters
@@ -388,8 +398,7 @@ GuiFontMetrics::breakAt_helper(docstring const & s, int const x,
 		--len;
 	LASSERT(len > 0 || qlen == 0, /**/);
 #endif
-	// The -1 is here to account for the leading zerow_nbsp.
-	return make_pair(len, int(line.naturalTextWidth()));
+	return make_pair(len, line_wid);
 }
 
 
diff --git a/status.22x b/status.22x
index 78c6a0e128..1e2710f1b7 100644
--- a/status.22x
+++ b/status.22x
@@ -77,7 +77,7 @@ What's new
 
 - Fix crash when closing master document with dirty child while Document
   Settings dialog is open (bug 9979).
-  
+
 - Fix random crash when dissolving inset (bug 10667).
 
 - Fix potential crash when cursor enters an inset (bug 10691).
@@ -101,6 +101,8 @@ What's new
 - Fix hole in selection for some zoom and justification values (bug
   8883).
 
+- Fix some rare cases of bad on-screen line breaking (bug #10700).
+
 - Fix cursor state after double/triple click in mathed (bug #10686).
 
 - Avoid a case of stuck cursor after entering an inset (bug 10630).