From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 31 Aug 2017 12:52:30 +0000 (+0200)
Subject: When a row is shortened, reset its flushed() attribute.
X-Git-Tag: 2.2.4~87
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8ff22de938fd47cf126e628cd8b7fa0a482cedba;p=features.git

When a row is shortened, reset its flushed() attribute.

Fixes bug #10699.

(cherry picked from commit 59e2c40564f441044d38f2082b8a038cc093c932)
---

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index f61db67f72..e5a7d5ca0f 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -947,7 +947,8 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
 	int const next_width = max_width_ - leftMargin(max_width_, pit, row.endpos())
 		- rightMargin(pit);
 
-	row.shortenIfNeeded(body_pos, width, next_width);
+	if (row.shortenIfNeeded(body_pos, width, next_width))
+		row.flushed(false);
 	row.right_boundary(!row.empty() && row.endpos() < end
 	                   && row.back().endpos == row.endpos());
 	// Last row in paragraph is flushed
diff --git a/status.22x b/status.22x
index 1e2710f1b7..e5ee170235 100644
--- a/status.22x
+++ b/status.22x
@@ -103,6 +103,8 @@ What's new
 
 - Fix some rare cases of bad on-screen line breaking (bug #10700).
 
+- Fix bad justification before a displayed inset (bug 10699).
+
 - Fix cursor state after double/triple click in mathed (bug #10686).
 
 - Avoid a case of stuck cursor after entering an inset (bug 10630).