From: Jürgen Vigna <jug@sad.it>
Date: Fri, 27 Apr 2001 14:21:18 +0000 (+0000)
Subject: Reverted the reverted changes - 1.
X-Git-Tag: 1.6.10~21267
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e7ae04343eeb55d92b52c979c2fd5f5ea54ccf38;p=features.git

Reverted the reverted changes - 1.


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

diff --git a/src/ChangeLog b/src/ChangeLog
index af593e047d..544e760154 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-27  Juergen Vigna  <jug@sad.it>
+
+	* text.C (Fill): return 20 instead of 0 if paper_width < 0 (endless)
+	(SetHeightOfRow): comment out the update call should not be needed!
+
 2001-04-13  Juergen Vigna  <jug@sad.it>
 
 	* tabular.C (GetAdditionalHeight): changed parameter from cell to row.
diff --git a/src/text.C b/src/text.C
index 066717f57d..f471ee8207 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1157,7 +1157,7 @@ LyXText::NextBreakPoint(BufferView * bview, Row const * row, int width) const
 int LyXText::Fill(BufferView * bview, Row * row, int paper_width) const
 {
 	if (paper_width < 0)
-		return 0;
+		return 20;
 
 	int w;
 	// get the pure distance
@@ -1202,6 +1202,11 @@ int LyXText::Fill(BufferView * bview, Row * row, int paper_width) const
 	}
 	
 	int const fill = paper_width - w - RightMargin(bview->buffer(), row);
+#waring Please fix me (Jug!)
+#if 0
+	if (fill < 0)
+		return 0;
+#endif
 	return fill;
 }
 
@@ -1412,7 +1417,7 @@ void LyXText::SetHeightOfRow(BufferView * bview, Row * row_ptr) const
 		   tmpfont = GetFont(bview->buffer(), row_ptr->par(), pos);
 		   tmpinset = row_ptr->par()->GetInset(pos);
 		   if (tmpinset) {
-			   tmpinset->update(bview, tmpfont);
+//			   tmpinset->update(bview, tmpfont);
 			   asc = tmpinset->ascent(bview, tmpfont);
 			   desc = tmpinset->descent(bview, tmpfont);
 			   maxwidth += tmpinset->width(bview, tmpfont);