anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 10:47:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix left margin with some nested layouts (#9538)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2015-05-12 15:47:38 +02:00
parent 34da634451
commit 5f20d05b1b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TextMetrics.cpp
View File

@ -1610,12 +1610,16 @@ int TextMetrics::leftMargin(int max_width,
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth( l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
tclass.leftmargin()); tclass.leftmargin());
if (par.getDepth() != 0) { int depth = par.getDepth();
if (depth != 0) {
// find the next level paragraph // find the next level paragraph
pit_type newpar = text_->outerHook(pit); pit_type newpar = text_->outerHook(pit);
if (newpar != pit_type(pars.size())) { if (newpar != pit_type(pars.size())) {
if (pars[newpar].layout().isEnvironment()) { if (pars[newpar].layout().isEnvironment()) {
l_margin = leftMargin(max_width, newpar); int nestmargin = depth * nestMargin();
if (text_->isMainText())
nestmargin += changebarMargin();
l_margin = max(leftMargin(max_width, newpar), nestmargin);
// Remove the parindent that has been added // Remove the parindent that has been added
// if the paragraph was empty. // if the paragraph was empty.
if (pars[newpar].empty() && if (pars[newpar].empty() &&