anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-01 13:40:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some row breaking problems with large insets

Browse Source 
When a row is too large due to a wide inset, it does not make sense to
break text before if the problem is the same in the next row.
Therefore give up breaking in this case.

Note that this was explicitely taken care of in the old-world
rowBreakPoint code.

Fixes bug #9691.
This commit is contained in:
Jean-Marc Lasgouttes 2015-07-23 11:59:51 +02:00
parent 125a297778
commit f921c2e8ec
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Row.cpp
View File

@ -404,7 +404,8 @@ void Row::shortenIfNeeded(pos_type const keep, int const w)
++cit_brk; ++cit_brk;
while (cit_brk != beg) { while (cit_brk != beg) {
--cit_brk; --cit_brk;
Element & brk = *cit_brk; // make a copy of the element to work on it.
Element brk = *cit_brk;
wid_brk -= brk.dim.wid; wid_brk -= brk.dim.wid;
if (brk.countSeparators() == 0 || brk.pos < keep) if (brk.countSeparators() == 0 || brk.pos < keep)
continue; continue;
@ -415,6 +416,15 @@ void Row::shortenIfNeeded(pos_type const keep, int const w)
* break-up. * break-up.
*/ */
if (brk.breakAt(min(w - wid_brk, brk.dim.wid - 2), false)) { if (brk.breakAt(min(w - wid_brk, brk.dim.wid - 2), false)) {
/* if this element originally did not cause a row overflow
* in itself, and the remainder of the row would still be
* too large after breaking, then we will have issues in
* next row. Thus breaking does not help.
*/
if (wid_brk + cit_brk->dim.wid < w
&& dim_.wid - (wid_brk + brk.dim.wid) >= w) {
break;
}
end_ = brk.endpos; end_ = brk.endpos;
/* after breakAt, there may be spaces at the end of the /* after breakAt, there may be spaces at the end of the
* string, but they are not counted in the string length * string, but they are not counted in the string length
@ -424,6 +434,7 @@ void Row::shortenIfNeeded(pos_type const keep, int const w)
*/ */
brk.str = rtrim(brk.str); brk.str = rtrim(brk.str);
brk.endpos = brk.pos + brk.str.length(); brk.endpos = brk.pos + brk.str.length();
*cit_brk = brk;
dim_.wid = wid_brk + brk.dim.wid; dim_.wid = wid_brk + brk.dim.wid;
// If there are other elements, they should be removed. // If there are other elements, they should be removed.
elements_.erase(cit_brk + 1, end); elements_.erase(cit_brk + 1, end);