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

hm... too eager I suppose

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7591 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-08-22 12:00:58 +00:00
parent 359519bda4
commit 371e05fd3e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/text.C
View File

@ -999,9 +999,21 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
if (par.isInset(pos)) {
InsetOld const * tmpinset = par.getInset(pos);
if (tmpinset) {
#if 1 // this is needed for deep update on initialitation
#warning inset->update FIXME
//tmpinset->update(bv());
LyXFont const tmpfont = getFont(pit, pos);
Dimension dim;
MetricsInfo mi(bv(), tmpfont, workWidth());
tmpinset->metrics(mi, dim);
maxwidth += dim.wid;
maxasc = max(maxasc, dim.asc);
maxdesc = max(maxdesc, dim.des);
#else
maxwidth += tmpinset->width();
maxasc = max(maxasc, tmpinset->ascent());
maxdesc = max(maxdesc, tmpinset->descent());
#endif
}
} else {
// Fall-back to normal case
@ -1221,15 +1233,12 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
rit->top_of_text(rit->baseline() - font_metrics::maxAscent(font));
double x = 0;
if (layout->margintype != MARGIN_RIGHT_ADDRESS_BOX) {
#warning needed?
#if 0
// this IS needed
rit->width(maxwidth);
double dummy;
prepareToPrint(pit, rit, x, dummy, dummy, dummy, false);
#endif
}
rit->width(int(maxwidth + x));
if (inset_owner) {
width = max(0, workWidth());
@ -1973,7 +1982,9 @@ void LyXText::backspace()
}
cursorLeft(bv());
redoParagraph(cursor.par());
// the layout things can change the height of a row !
setHeightOfRow(cursor.par(), cursorRow());
return;
}
}