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

Fix endless loop when breaking text

Browse Source 
For some reason, Qt can break strings before the first character
(although we try to prevent that). The code was not prepared to that,
now it is.

Remove a forgotten debug statement.
This commit is contained in:
Jean-Marc Lasgouttes 2021-12-09 16:43:16 +01:00
parent b461d07b5b
commit dcef1a9cad
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Row.cpp
View File

@ -162,6 +162,12 @@ bool Row::Element::splitAt(int const width, int next_width, bool force,
bool first = true;
docstring::size_type i = 0;
for (FontMetrics::Break const & brk : breaks) {
/* For some reason breakString can decide to break before the
* first character (normally we use a 0-width nbsp to prevent
* that). Skip leading empty elements, they are never wanted.
*/
if (first && brk.len == 0 && breaks.size() > 1)
continue;
Element e(STRING, pos + i, font, change);
e.str = str.substr(i, brk.len);
e.endpos = e.pos + brk.len;
@ -612,7 +618,6 @@ Row::Elements Row::shortenIfNeeded(int const w, int const next_width)
* splitting this time.
*/
if (cit->splitAt(w - wid, next_width, true, tail)) {
LYXERR0(*cit);
end_ = cit->endpos;
dim_.wid = wid + cit->dim.wid;
// If there are other elements, they should be removed.