From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 30 Nov 2015 21:00:48 +0000 (+0100)
Subject: Fix width of row when there are active hfills
X-Git-Tag: 2.2.0beta1~511
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=39e33d513844b0102dac11abfa9cced4bd98bc17;p=features.git

Fix width of row when there are active hfills

It is important to make sure in computeRowMetrics that the row width
is correct at the end, because we rely on it in several places.

Fixes bug #9870.
---

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index ee101b3987..889634adf5 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -596,6 +596,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 	if (nh > 0) {
 		hfill = w / nh;
 		hfill_rem = w % nh;
+		row.dimension().wid += w;
 	} else if (nh == 0 && int(row.width()) < max_width_) {
 		// is it block, flushleft or flushright?
 		// set x how you need it