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

Change the way the element's width is updated.

Browse Source 
Remove the code that computed the width every 30 characters (yay!).
Make sure that finalizeLast() is called after inserting a row element in
a row in breakParagraph.
This commit is contained in:
Jean-Marc Lasgouttes 2021-07-17 23:16:15 +02:00
parent 49115315ea
commit 890fcc0872
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Row.cpp
View File

@ -370,8 +370,7 @@ void Row::finalizeLast()
if (elt.change.changed()) if (elt.change.changed())
changebar_ = true; changebar_ = true;
if (elt.type == STRING) { if (elt.type == STRING && elt.dim.wid == 0) {
dim_.wid -= elt.dim.wid;
elt.dim.wid = theFontMetrics(elt.font).width(elt.str); elt.dim.wid = theFontMetrics(elt.font).width(elt.str);
dim_.wid += elt.dim.wid; dim_.wid += elt.dim.wid;
} }
@ -401,16 +400,8 @@ void Row::add(pos_type const pos, char_type const c,
e.row_flags = can_break ? CanBreakInside : Inline; e.row_flags = can_break ? CanBreakInside : Inline;
elements_.push_back(e); elements_.push_back(e);
} }
if (back().str.length() % 30 == 0) {
dim_.wid -= back().dim.wid;
back().str += c; back().str += c;
back().endpos = pos + 1; back().endpos = pos + 1;
back().dim.wid = theFontMetrics(back().font).width(back().str);
dim_.wid += back().dim.wid;
} else {
back().str += c;
back().endpos = pos + 1;
}
} }

1
src/TextMetrics.cpp
View File

@ -1092,6 +1092,7 @@ RowList TextMetrics::breakParagraph(Row const & bigrow) const
!elt.font.language()->wordWrap()); !elt.font.language()->wordWrap());
// a new element in the row // a new element in the row
rows.back().push_back(elt); rows.back().push_back(elt);
rows.back().finalizeLast();
pos = elt.endpos; pos = elt.endpos;
// Go to next element // Go to next element