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

Enable dissolve in undefined Flex inset context menu

Browse Source 
This is a hackish special case, so I had to add a hack...

Fixes bug #8650.
This commit is contained in:
Jean-Marc Lasgouttes 2019-09-11 15:49:50 +02:00
parent e1be71da59
commit 7c1c50d737
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/insets/InsetFlex.cpp
View File

@ -99,7 +99,9 @@ bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
InsetLayout const & il = getLayout(); InsetLayout const & il = getLayout();
InsetLayout::InsetLyXType const type = InsetLayout::InsetLyXType const type =
translateLyXType(to_utf8(cmd.argument())); translateLyXType(to_utf8(cmd.argument()));
if (il.lyxtype() == type) { if (il.lyxtype() == type
|| (il.name() == DocumentClass::plainInsetLayout().name()
&& type == InsetLayout::CHARSTYLE)) {
FuncRequest temp_cmd(LFUN_INSET_DISSOLVE); FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
return InsetCollapsible::getStatus(cur, temp_cmd, flag); return InsetCollapsible::getStatus(cur, temp_cmd, flag);
} else } else
@ -121,7 +123,9 @@ void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
InsetLayout::InsetLyXType const type = InsetLayout::InsetLyXType const type =
translateLyXType(to_utf8(cmd.argument())); translateLyXType(to_utf8(cmd.argument()));
if (il.lyxtype() == type) { if (il.lyxtype() == type
|| (il.name() == DocumentClass::plainInsetLayout().name()
&& type == InsetLayout::CHARSTYLE)) {
FuncRequest temp_cmd(LFUN_INSET_DISSOLVE); FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
InsetCollapsible::doDispatch(cur, temp_cmd); InsetCollapsible::doDispatch(cur, temp_cmd);
} else } else