anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove 'premature optimization' that proved buggy

Browse Source 
At some time it seemed like a good idea in breakRow() to return early
when the row was bound to be empty. It turns out that this creates two
symptoms:

* empty paragraphs will not have an end of paragraph marker

* since row width is not correctly computed in this case, caret ghosts
  can appear in master.

This commit removes the oprimization and replace the do {} while()
construct to a straightforward while() {}.

Related to bug #10952.

(cherry picked from commit 76f0a3dd4e)
This commit is contained in:
Jean-Marc Lasgouttes 2018-01-03 18:28:55 +01:00
parent 41fe69e5d0
commit 894ae19224
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/TextMetrics.cpp
View File

@ -834,11 +834,6 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
// the width available for the row.
int const width = max_width_ - row.right_margin;
if (pos >= end || row.width() > width) {
row.endpos(end);
return need_new_row;
}
#if 0
//FIXME: As long as leftMargin() is not correctly implemented for
// MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here.
@ -857,10 +852,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
// or the end of the par, then build a representation of the row.
pos_type i = pos;
FontIterator fi = FontIterator(*this, par, row.pit(), pos);
do {
// this can happen for an empty row after a newline
if (i >= end)
break;
while (i < end && row.width() <= width) {
char_type c = par.getChar(i);
// The most special cases are handled first.
if (par.isInset(i)) {
@ -942,7 +934,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
++i;
++fi;
} while (i < end && row.width() <= width);
}
row.finalizeLast();
row.endpos(i);