From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 31 Dec 2017 09:37:35 +0000 (+0100)
Subject: Mark follow-up paragraphs in a paragraph group as nested.
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~4101
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=761a542551bc9;p=features.git

Mark follow-up paragraphs in a paragraph group as nested.

This gives a more consistent indication of what belongs to an environment
(and semantically, such paragraphs are synonymous to nested standard
paragraphs)

Addresses part of #9261.
---

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 6fbc783b35..69b480d185 100644
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -272,7 +272,12 @@ void RowPainter::paintAppendix() const
 
 void RowPainter::paintDepthBar() const
 {
-	depth_type const depth = par_.getDepth();
+	depth_type depth = par_.getDepth();
+
+	// We also mark follow-up paragraphs in a paragraph group
+	if (par_.layout().isParagraphGroup()
+	    && !text_.isFirstInSequence(row_.pit()))
+		++depth;
 
 	if (depth <= 0)
 		return;
@@ -283,6 +288,10 @@ void RowPainter::paintDepthBar() const
 		if (row_.pos() == 0)
 			--pit2;
 		prev_depth = pars_[pit2].getDepth();
+		// We also mark follow-up paragraphs in a paragraph group
+		if (pars_[pit2].layout().isParagraphGroup()
+		    && !text_.isFirstInSequence(pit2))
+			++prev_depth;
 	}
 
 	depth_type next_depth = 0;
@@ -291,6 +300,10 @@ void RowPainter::paintDepthBar() const
 		if (row_.endpos() >= pars_[pit2].size())
 			++pit2;
 		next_depth = pars_[pit2].getDepth();
+		// We also mark follow-up paragraphs in a paragraph group
+		if (pars_[pit2].layout().isParagraphGroup()
+		    && !text_.isFirstInSequence(pit2))
+			++next_depth;
 	}
 
 	for (depth_type i = 1; i <= depth; ++i) {