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

Fix another glitch with on-screen indentation.

Browse Source 
If a new paragraph is created just before a nested environment,
the indentation of the nested environment is not computed
correctly because the parindent of the previous layout would
also be erroneously taken into account. This would cause the
nested environment to move back and forth when something is
added to the new paragraph.

A proper status line covering this change is already present.
This commit is contained in:
Enrico Forestieri 2014-05-24 02:12:56 +02:00
parent 5579d3734a
commit f40adfd486
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/TextMetrics.cpp
View File

@ -1892,6 +1892,13 @@ int TextMetrics::leftMargin(int max_width,
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); l_margin = leftMargin(max_width, newpar);
// Remove the parindent that has been added
// if the paragraph was empty.
if (pars[newpar].empty()) {
docstring pi = pars[newpar].layout().parindent;
l_margin -= theFontMetrics(
buffer.params().getFont()).signedWidth(pi);
}
} }
if (tclass.isDefaultLayout(par.layout()) if (tclass.isDefaultLayout(par.layout())
|| tclass.isPlainLayout(par.layout())) { || tclass.isPlainLayout(par.layout())) {