anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 06:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted the reverted changes - 1.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1970 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2001-04-27 14:21:18 +00:00
parent ceeb10f1b0
commit e7ae04343e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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> 2001-04-13 Juergen Vigna <jug@sad.it>
* tabular.C (GetAdditionalHeight): changed parameter from cell to row. * tabular.C (GetAdditionalHeight): changed parameter from cell to row.

9
src/text.C
View File

@ -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 int LyXText::Fill(BufferView * bview, Row * row, int paper_width) const
{ {
if (paper_width < 0) if (paper_width < 0)
return 0; return 20;
int w; int w;
// get the pure distance // 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); 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; return fill;
} }
@ -1412,7 +1417,7 @@ void LyXText::SetHeightOfRow(BufferView * bview, Row * row_ptr) const
tmpfont = GetFont(bview->buffer(), row_ptr->par(), pos); tmpfont = GetFont(bview->buffer(), row_ptr->par(), pos);
tmpinset = row_ptr->par()->GetInset(pos); tmpinset = row_ptr->par()->GetInset(pos);
if (tmpinset) { if (tmpinset) {
tmpinset->update(bview, tmpfont); // tmpinset->update(bview, tmpfont);
asc = tmpinset->ascent(bview, tmpfont); asc = tmpinset->ascent(bview, tmpfont);
desc = tmpinset->descent(bview, tmpfont); desc = tmpinset->descent(bview, tmpfont);
maxwidth += tmpinset->width(bview, tmpfont); maxwidth += tmpinset->width(bview, tmpfont);