Maintain plain layout for separating paragraphs when switching layouts (#11936)

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 95c9f83ac25a2f75d5e603c761d5d8d37099d691..88ea65541f044b596ff33fc63aa44020f4b7fd42 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -185,6 +185,12 @@ ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
 }
 
 
+ParagraphMetrics & TextMetrics::parMetrics(pit_type pit)
+{
+       return parMetrics(pit, true);
+}
+
+
 void TextMetrics::newParMetricsDown()
 {
        pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
@@ -1139,6 +1145,14 @@ void TextMetrics::setRowHeight(Row & row) const
        int maxasc = int(fm.maxAscent() * spacing_val);
        int maxdes = int(fm.maxDescent() * spacing_val);
 
+       // Take label string into account (useful if labelfont is large)
+       if (row.pos() == 0 && layout.labelIsInline()) {
+               FontInfo const labelfont = text_->labelFont(par);
+               FontMetrics const & lfm = theFontMetrics(labelfont);
+               maxasc = max(maxasc, int(lfm.maxAscent() * spacing_val));
+               maxdes = max(maxdes, int(lfm.maxDescent() * spacing_val));
+       }
+
        // Find the ascent/descent of the row contents
        for (Row::Element const & e : row) {
                if (e.inset) {