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.3.0rc1~146
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bd88740b065d312c2834701b410222e40009f623;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 f94accae67..e3a1f26092 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -966,7 +966,8 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 	int const next_width = max_width_ - leftMargin(row.pit(), row.endpos())
 		- rightMargin(row.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