anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup e1be71da5: avoid duplication of layout

Browse Source 
If the containing paragraph has kept its layout, reset the layout of
the first paragraph of the newly inserted inset.
This commit is contained in:
Jean-Marc Lasgouttes 2020-09-07 14:16:47 +02:00
parent a58bcf1d27
commit 9b18a9b609
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Text3.cpp
View File

@ -293,6 +293,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
}
bool gotsel = false;
bool move_layout = false;
if (cur.selection()) {
if (cmd.action() == LFUN_INDEX_INSERT)
copySelectionToTemp(cur);
@ -303,8 +304,10 @@ static bool doInsertInset(Cursor & cur, Text * text,
* FIXME: this does not work as expected when change tracking is on
* However, we do not really know what to do in this case.
*/
if (cur.paragraph().empty() && !inset->forcePlainLayout())
if (cur.paragraph().empty() && !inset->forcePlainLayout()) {
cur.paragraph().setPlainOrDefaultLayout(bparams.documentClass());
move_layout = true;
}
}
cur.clearSelection();
gotsel = true;
@ -330,6 +333,11 @@ static bool doInsertInset(Cursor & cur, Text * text,
inset_text->fixParagraphsFont();
cur.pos() = 0;
cur.pit() = 0;
/* If the containing paragraph has kept its layout, reset the
* layout of the first paragraph of the inset.
*/
if (!move_layout)
cur.paragraph().setPlainOrDefaultLayout(bparams.documentClass());
// FIXME: what does this do?
if (cmd.action() == LFUN_FLEX_INSERT)
return true;