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

Fix duplicate, disabled "Separated Frame Below"

Browse Source 
This commit fixes an issue where the menu option "Insert Separated
Frame Below" would show up twice, with one instance disabled. This
occurred when there was a "Standard" environment nested in a
"Frame". With this commit, the duplicate instance is removed.

(cherry picked from commit 4f7a5f8c3e)
This commit is contained in:
Scott Kostyshak 2018-04-27 23:01:01 -04:00
parent 0a43aac524
commit 6a808d285c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt4/Menus.cpp
View File

@ -1917,9 +1917,10 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv,
translateIfPossible(prevlayout));
// We use command-alternatives here since this is how the binding is defined
// (otherwise, the binding is not displayed in the menu)
add(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_COMMAND_ALTERNATIVES,
from_ascii("environment-split ; environment-split previous"))));
if (getStatus(FuncRequest(LFUN_ENVIRONMENT_SPLIT)).enabled())
add(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_COMMAND_ALTERNATIVES,
from_ascii("environment-split ; environment-split previous"))));
}
if (!outerlayout.empty()) {
docstring label;

2
status.23x
View File

@ -234,6 +234,8 @@ What's new
- Do not allow paragraph styles in listings (bug 11127).
- Fix duplicate, disabled "Separated <Environment> Below" menu item.
* INTERNALS