From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Mon, 9 Jul 2018 01:38:00 +0000 (-0400)
Subject: Fix bug #10177.
X-Git-Tag: 2.3.2~45
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1d22d2380897ad1b747a03283af08ab8b2c7d63b;p=features.git

Fix bug #10177.

The left margin given at class level should apply only to the main text.

(cherry picked from commit a007b65202cbc103e3e7868dcde3e754bfcd276d)
---

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 20ff864ed8..cacf2e7ea6 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1618,10 +1618,10 @@ int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const
 
 	int l_margin = 0;
 
-	if (text_->isMainText())
+	if (text_->isMainText()) {
 		l_margin += bv_->leftMargin();
-
-	l_margin += bfm.signedWidth(tclass.leftmargin());
+		l_margin += bfm.signedWidth(tclass.leftmargin());
+	}
 
 	int depth = par.getDepth();
 	if (depth != 0) {
diff --git a/status.23x b/status.23x
index 812698f7df..295de4887b 100644
--- a/status.23x
+++ b/status.23x
@@ -159,6 +159,8 @@ What's new
 
 - Fix some missing screen updates (bug 11323, regression in 2.3.1).
 
+- Allow adjustment of margin settings in InsetLayout (bug 10177).
+
 
 * INTERNALS