From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 21 Jul 2016 08:21:45 +0000 (+0200)
Subject: Recompute Paragraph::beginOfBody() earlier
X-Git-Tag: 2.2.2~112
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cf6b30ae76ebab5dfc1e2d70d5320abc060aa95f;p=features.git

Recompute Paragraph::beginOfBody() earlier

In redoParagraph, this should be done before coping with the insets,
other wise some graphic gliches may occur. This is a better fix for

Fixes bug #10163.

(cherry picked from commit 71374b38c26585dc060e923452f2dd873ef00f15)
---

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index ed819812c4..a26b88dc72 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -402,6 +402,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	}
 
 	// redo insets
+	par.setBeginOfBody();
 	Font const bufferfont = buffer.params().getFont();
 	CoordCache::Insets & insetCache = bv_->coordCache().insets();
 	InsetList::const_iterator ii = par.insetList().begin();
@@ -435,7 +436,6 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		}
 	}
 
-	par.setBeginOfBody();
 	pos_type first = 0;
 	size_t row_index = 0;
 	// maximum pixel width of a row
diff --git a/status.22x b/status.22x
index 7800d1cb9c..d5eecbff26 100644
--- a/status.22x
+++ b/status.22x
@@ -49,7 +49,11 @@ What's new
 
 - Fix display of multi-author citations when the GUI language is not English.
 
-- Fix bug where change tracking marks are lost under math insets (bug 10265).
+- Fix bug where change tracking marks are lost under math insets (bug
+  10265).
+
+- Fix display glitch when switching to Description layout with an inset
+  at the beginning of the paragraph (bug 10163)
 
 * INTERNALS