From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 20 Jul 2018 13:23:55 +0000 (+0200)
Subject: Fix disappearing blue language underline.
X-Git-Tag: 2.3.2~105
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=93f861903d5b4275922158b033d22f38af203e22;p=lyx.git

Fix disappearing blue language underline.

Make sure that the blue language underline is not below the bottom of
the row. Otherwise, it can disappear when the next row is painted.

(cherry picked from commit 8e9e05067014a7c5fad501a0f4e8ffbb56eed165)
---

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 38bcefadad..94516ba109 100644
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -149,8 +149,8 @@ void RowPainter::paintForeignMark(Row::Element const & e) const
 		return;
 
 	int const desc = e.inset ? e.dim.descent() : 0;
-	int const y = yo_ + pi_.base.solidLineOffset()
-		+ desc + pi_.base.solidLineThickness() / 2;
+	int const y = yo_ + min(3 * pi_.base.solidLineOffset() / 2 + desc,
+	                        row_.descent() - 1);
 	pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
 	              Painter::line_solid, pi_.base.solidLineThickness());
 }
diff --git a/status.23x b/status.23x
index fbd2fcff4c..8f5741c420 100644
--- a/status.23x
+++ b/status.23x
@@ -98,6 +98,8 @@ What's new
 
 - Fix issues with dead key accents (bug 11183).
 
+- Fix disappearance of blue (language) line in some situations.
+
 
 
 * INTERNALS