From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 11 May 2018 13:11:06 +0000 (+0200)
Subject: Fix InsetBox::contentAlignment()
X-Git-Tag: 2.3.1~83
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d35055de8387c7d1a06454fb7362928f700a6b7b;p=features.git

Fix InsetBox::contentAlignment()

Some cases where alignment is possible were missing.

Candidate for 2.3.x.

(cherry picked from commit de67b68b1dc140321e5d0e2e6b4507c972703744)
---

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index c593c4c759..9d60ffcfae 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -227,7 +227,9 @@ ColorCode InsetBox::backgroundColor(PainterInfo const &) const
 
 LyXAlignment InsetBox::contentAlignment() const
 {
-	if (!params_.use_makebox)
+	// Custom horizontal alignment is only allowed with a fixed width
+	// and if either makebox or no inner box are used
+	if (params_.width.empty() || !(params_.use_makebox || !params_.inner_box))
 		return LYX_ALIGN_NONE;
 
 	// The default value below is actually irrelevant
diff --git a/status.23x b/status.23x
index 881f7cd8cb..1b4acac92a 100644
--- a/status.23x
+++ b/status.23x
@@ -248,6 +248,8 @@ What's new
 
 - Fix duplicate, disabled "Separated <Environment> Below" menu item.
 
+- Fix horizontal alignment of some Box types on screen.
+
 
 * INTERNALS