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

Use the new tokenizing and breaking code instead of breakRow.

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2021-07-14 00:48:03 +02:00
parent ef88e31a1f
commit 0a18a4e763
1 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/TextMetrics.cpp
View File

@ -516,43 +516,28 @@ bool TextMetrics::redoParagraph(pit_type const pit, bool const align_rows)
} }
} }
pos_type first = 0; // Transform the paragraph into a single row containing all the elements.
size_t row_index = 0; Row const bigrow = tokenizeParagraph(pit);
bool need_new_row = false; // Split the row in several rows fitting in available width
// maximum pixel width of a row pm.rows() = breakParagraph(bigrow);
do {
if (row_index == pm.rows().size()) /* If there is more than one row, expand the text to the full
pm.rows().push_back(Row()); * allowable width. This setting here is needed for the
else * setRowAlignment() below. We do nothing when tight insets are
pm.rows()[row_index] = Row(); * requested.
Row & row = pm.rows()[row_index];
row.pit(pit);
row.pos(first);
need_new_row = breakRow(row, right_margin);
setRowHeight(row);
row.changed(true);
if ((row_index || row.endpos() < par.size() || row.right_boundary())
&& !tight_) {
/* If there is more than one row or the row has been
* broken by a display inset or a newline, expand the text
* to the full allowable width. This setting here is
* needed for the setRowAlignment() below.
* We do nothing when tight insets are requested.
*/ */
if (dim_.wid < max_width_) if (pm.rows().size() > 1 && !tight_ && dim_.wid < max_width_)
dim_.wid = max_width_; dim_.wid = max_width_;
}
// Compute height and alignment of the rows.
for (Row & row : pm.rows()) {
setRowHeight(row);
if (align_rows) if (align_rows)
setRowAlignment(row, max(dim_.wid, row.width())); setRowAlignment(row, max(dim_.wid, row.width()));
first = row.endpos();
++row_index;
pm.dim().wid = max(pm.dim().wid, row.width() + row.right_margin); pm.dim().wid = max(pm.dim().wid, row.width() + row.right_margin);
pm.dim().des += row.height(); pm.dim().des += row.height();
} while (first < par.size() || need_new_row); }
if (row_index < pm.rows().size())
pm.rows().resize(row_index);
// This type of margin can only be handled at the global paragraph level // This type of margin can only be handled at the global paragraph level
if (par.layout().margintype == MARGIN_RIGHT_ADDRESS_BOX) { if (par.layout().margintype == MARGIN_RIGHT_ADDRESS_BOX) {