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

Improve comments

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2023-09-25 12:46:16 +02:00
parent 71d9f6e90d
commit 549969a563
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Row.cpp
View File

@ -574,9 +574,9 @@ Row::Elements Row::shortenIfNeeded(int const max_width, int const next_width)
--cit_brk; --cit_brk;
// make a copy of the element to work on it. // make a copy of the element to work on it.
Element brk = *cit_brk; Element brk = *cit_brk;
/* If the current element is an inset that allows breaking row /* If the current element allows breaking row after itself,
* after itself, and if the row is already short enough after * and if the row is already short enough after this element,
* this element, then cut right after it. * then cut right after it.
*/ */
if (wid_brk <= max_width && brk.row_flags & CanBreakAfter) { if (wid_brk <= max_width && brk.row_flags & CanBreakAfter) {
end_ = brk.endpos; end_ = brk.endpos;
@ -586,9 +586,9 @@ Row::Elements Row::shortenIfNeeded(int const max_width, int const next_width)
} }
// assume now that the current element is not there // assume now that the current element is not there
wid_brk -= brk.dim.wid; wid_brk -= brk.dim.wid;
/* If the current element is an inset that allows breaking row /* If the current element allows breaking row before itself,
* before itself, and if the row is already short enough before * and if the row is already short enough before this element,
* this element, then cut right before it. * then cut right before it.
*/ */
if (wid_brk <= max_width && brk.row_flags & CanBreakBefore && cit_brk != beg) { if (wid_brk <= max_width && brk.row_flags & CanBreakBefore && cit_brk != beg) {
end_ = (cit_brk -1)->endpos; end_ = (cit_brk -1)->endpos;
@ -615,13 +615,14 @@ Row::Elements Row::shortenIfNeeded(int const max_width, int const next_width)
/* if this element originally did not cause a row overflow /* if this element originally did not cause a row overflow
* in itself, and the remainder of the row would still be * in itself, and the remainder of the row would still be
* too large after breaking, then we will have issues in * too large after breaking, then we will have issues in
* next row. Thus breaking does not help. * next row. Thus breaking here does not help.
*/ */
if (wid_brk + cit_brk->dim.wid < max_width if (wid_brk + cit_brk->dim.wid < max_width
&& min_row_wid - (wid_brk + brk.dim.wid) >= next_width) { && min_row_wid - (wid_brk + brk.dim.wid) >= next_width) {
tail.clear(); tail.clear();
break; break;
} }
// We have found a proper place where to break this string element.
end_ = brk.endpos; end_ = brk.endpos;
*cit_brk = brk; *cit_brk = brk;
dim_.wid = wid_brk + brk.dim.wid; dim_.wid = wid_brk + brk.dim.wid;