From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Tue, 27 Sep 2005 08:48:53 +0000 (+0000)
Subject: fix inset width calculation (bug 1957)
X-Git-Tag: 1.6.10~13883
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d9d8fa107b7f4ff0fabda989e3b6588831db4007;p=features.git

fix inset width calculation (bug 1957)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10489 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 752c5c0bea..64b850b8ac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,10 @@
 2005-09-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
-	* text3.C (dispatch): leave inset to the right when hitting ESC.
+	* text.C (redoParagraph): fix calcultation of inset width wrt 
+	leftMargin (bug 1957).
+
+	* text3.C (dispatch): leave inset to the right when hitting ESC 
+	(bug 2034).
 
 2005-09-23  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
diff --git a/src/text.C b/src/text.C
index f79a95e0e8..9f898a515a 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1694,7 +1694,7 @@ bool LyXText::redoParagraph(pit_type const pit)
 	InsetList::iterator iend = par.insetlist.end();
 	for (; ii != iend; ++ii) {
 		Dimension dim;
-		int const w = maxwidth_ - leftMargin(pit) - rightMargin(par);
+		int const w = maxwidth_ - leftMargin(pit, ii->pos) - rightMargin(par);
 		MetricsInfo mi(bv(), getFont(par, ii->pos), w);
 		ii->inset->metrics(mi, dim);
 	}