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

Be careful about accounting for the right margin

Browse Source 
In computeRowMetrics, the right margin of the row shall be taken in account when the text is not left-aligned. Rewrite the code in terms of the available width `w' to avoid this pitfall.
This commit is contained in:
Jean-Marc Lasgouttes 2015-11-06 14:28:05 +01:00
parent 1663dbcbcf
commit 89dca6d3a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/TextMetrics.cpp
View File

@ -590,10 +590,10 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
if (ns && !row.right_boundary()
&& row.endpos() != par.size()) {
row.setSeparatorExtraWidth(double(w) / ns);
row.dimension().wid = width;
row.dimension().wid += w;
} else if (text_->isRTL(par)) {
row.dimension().wid = width;
row.left_margin += w;
row.dimension().wid += w;
}
break;
}
@ -602,7 +602,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
row.dimension().wid += w;
break;
case LYX_ALIGN_CENTER:
row.dimension().wid = width - w / 2;
row.dimension().wid += w / 2;
row.left_margin += w / 2;
break;
case LYX_ALIGN_LEFT: