anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-14 12:25:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove the ->display(false) code in rowBreakPoint

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6520 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-03-17 16:33:49 +00:00
parent 064714a102
commit 3e69f1b800
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2003-03-17 John Levon <levon@movementarian.org>
* text.C (rowBreakPoint): remove attempt to fix displayed
math insets inside a manual label
2003-03-17 Lars Gullik Bjønnes <larsbj@gullik.net> 2003-03-17 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyxtext.h: remove BufferView* as first arg from almost all class * lyxtext.h: remove BufferView* as first arg from almost all class

20
src/text.C
View File

@ -710,12 +710,8 @@ namespace {
pos_type addressBreakPoint(pos_type i, Paragraph * par) pos_type addressBreakPoint(pos_type i, Paragraph * par)
{ {
for (; i < par->size(); ++i) { for (; i < par->size(); ++i) {
if (par->isNewline(i)) { if (par->isNewline(i))
return i; return i;
} else if (par->isInset(i) && par->getInset(i)->display()) {
// FIXME: what are we doing modifying stuff here !
par->getInset(i)->display(false);
}
} }
return par->size(); return par->size();
@ -787,22 +783,14 @@ LyXText::rowBreakPoint(Row const & row) const
chunkwidth += thiswidth; chunkwidth += thiswidth;
Inset * in = par->isInset(i) ? par->getInset(i) : 0; Inset * in = par->isInset(i) ? par->getInset(i) : 0;
bool display = (in && (in->display() || in->needFullRow())); bool fullrow = (in && (in->display() || in->needFullRow()));
// check whether a Display() inset is valid here.
// If not, change it to non-display. FIXME:
// we should not be modifying things at this
// point !
if (in && in->display() && (layout->isCommand() ||
(layout->labeltype == LABEL_MANUAL && i < body_pos)))
in->display(false);
// break before a character that will fall off // break before a character that will fall off
// the right of the row // the right of the row
if (x >= width) { if (x >= width) {
// if no break before or we are at an inset // if no break before or we are at an inset
// that will take up a row, break here // that will take up a row, break here
if (point == last || display || chunkwidth >= (width - left)) { if (point == last || fullrow || chunkwidth >= (width - left)) {
if (pos < i) if (pos < i)
point = i - 1; point = i - 1;
else else
@ -820,7 +808,7 @@ LyXText::rowBreakPoint(Row const & row) const
continue; continue;
} }
if (!display) if (!fullrow)
continue; continue;
// full row insets start at a new row // full row insets start at a new row