From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 20 Sep 2018 21:51:21 +0000 (+0200)
Subject: Avoid space before completion in mathed
X-Git-Tag: 2.3.2~83
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=97f3f180078a8c6336477cd44121e7f3d4a07783;p=lyx.git

Avoid space before completion in mathed

This can happen if the current element has space after it (e.g. before
a relation).

Fixes bug #11283.

(cherry picked from commit 1b5ccecd65a795ba4ff21aa5733fa18866fefd1c)
---

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index c2b1a00a43..472b6db927 100644
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -381,12 +381,14 @@ void MathRow::draw(PainterInfo & pi, int x, int const y) const
 
 		if (!s1.empty()) {
 			f.setColor(Color_inlinecompletion);
-			pi.pain.text(x, y, s1, f);
+			// offset the text by e.after to make sure that the
+			// spacing is after the completion, not before.
+			pi.pain.text(x - e.after, y, s1, f);
 			x += mathed_string_width(f, s1);
 		}
 		if (!s2.empty()) {
 			f.setColor(Color_nonunique_inlinecompletion);
-			pi.pain.text(x, y, s2, f);
+			pi.pain.text(x - e.after, y, s2, f);
 			x += mathed_string_width(f, s2);
 		}
 	}
diff --git a/status.23x b/status.23x
index 7f5e56d813..d70960c8a3 100644
--- a/status.23x
+++ b/status.23x
@@ -126,6 +126,7 @@ What's new
 
 - Improve automatic removal of extra spaces, aka DEPM (bug 10503).
 
+- Avoid white space before math completion (bug 11283).
 
 
 * INTERNALS