anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kill macro mode when using LFUN_ESCAPE

Browse Source 
Add a `cancel' boolean to macroModeClose() that just removes all trace
of what has been entered instead of finalizing it.

When entering a macro in mathed, let LFUN_ESCAPE invoke
macroModeClose(true). The new semantics of LFUN_ESCAPE in mathed is
thus to abort the input of a macro name.

Fixes bug #9251.
This commit is contained in:
Jean-Marc Lasgouttes 2018-02-20 12:09:10 +01:00
parent ed7cdfff26
commit 9296344b9a
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cursor.cpp
View File

@ -1672,7 +1672,7 @@ void Cursor::setTargetX()
} }
bool Cursor::macroModeClose() bool Cursor::macroModeClose(bool cancel)
{ {
if (!inMacroMode()) if (!inMacroMode())
return false; return false;
@ -1685,7 +1685,7 @@ bool Cursor::macroModeClose()
cell().erase(pos()); cell().erase(pos());
// do nothing if the macro name is empty // do nothing if the macro name is empty
if (s == "\\") if (s == "\\" || cancel)
return false; return false;
// trigger updates of macros, at least, if no full // trigger updates of macros, at least, if no full

6
src/Cursor.h
View File

@ -501,9 +501,9 @@ public:
/// ///
void plainInsert(MathAtom const & at); void plainInsert(MathAtom const & at);
/// interpret name of a macro. Returns true if something got /// interpret name of a macro or ditch it if \c cancel is true.
/// inserted. /// Returns true if something got inserted.
bool macroModeClose(); bool macroModeClose(bool cancel = false);
/// are we currently typing the name of a macro? /// are we currently typing the name of a macro?
bool inMacroMode() const; bool inMacroMode() const;
/// get access to the macro we are currently typing /// get access to the macro we are currently typing

8
src/mathed/InsetMathNest.cpp
View File

@ -836,8 +836,12 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
if (cur.selection()) if (cur.selection())
cur.clearSelection(); cur.clearSelection();
else { else {
cmd = FuncRequest(LFUN_FINISHED_FORWARD); if (cur.inMacroMode())
cur.undispatched(); cur.macroModeClose(true);
else {
cmd = FuncRequest(LFUN_FINISHED_FORWARD);
cur.undispatched();
}
} }
break; break;