]> git.lyx.org Git - features.git/commitdiff
Revert "Mark follow-up paragraphs in a paragraph group as nested."
authorJuergen Spitzmueller <spitz@lyx.org>
Thu, 8 Feb 2018 16:09:15 +0000 (17:09 +0100)
committerJuergen Spitzmueller <spitz@lyx.org>
Thu, 8 Feb 2018 16:09:15 +0000 (17:09 +0100)
This reverts commit 70d580fea7c0d3e914a56b9a52b401b9f948e78d.

src/RowPainter.cpp

index 115efba6317cf33721c28def73e9a23d18023e19..1f89b252b9a099d3610e50cbc0fecd96d946452b 100644 (file)
@@ -285,13 +285,7 @@ void RowPainter::paintAppendix() const
 
 void RowPainter::paintDepthBar() const
 {
-       depth_type depth = par_.getDepth();
-
-       // We also mark follow-up paragraphs in a paragraph group
-       if (par_.layout().isParagraphGroup()
-           && par_.layout().labeltype == LABEL_STATIC
-           && !text_.isFirstInSequence(row_.pit()))
-               ++depth;
+       depth_type const depth = par_.getDepth();
 
        if (depth <= 0)
                return;
@@ -302,11 +296,6 @@ 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()
-                   && pars_[pit2].layout().labeltype == LABEL_STATIC
-                   && !text_.isFirstInSequence(pit2))
-                       ++prev_depth;
        }
 
        depth_type next_depth = 0;
@@ -315,11 +304,6 @@ 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()
-                   && pars_[pit2].layout().labeltype == LABEL_STATIC
-                   && !text_.isFirstInSequence(pit2))
-                       ++next_depth;
        }
 
        for (depth_type i = 1; i <= depth; ++i) {