anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed shortcuts to toggle autocorrect.

Browse Source 
They are not really needed now that autocorrection can be undone. This
increases autocorrect usability.
This commit is contained in:
Isaac 2019-05-25 11:07:26 +12:00 committed by Jean-Marc Lasgouttes
parent af0c6abd21
commit 3519be2292
3 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cursor.cpp
View File

@ -121,19 +121,19 @@ DocIterator bruteFind(Cursor const & c, int x, int y)
CursorData::CursorData()
: DocIterator(), anchor_(), selection_(false), mark_(false),
word_selection_(false), autocorrect_(false), current_font(inherit_font)
word_selection_(false), current_font(inherit_font)
{}
CursorData::CursorData(Buffer * buffer)
: DocIterator(buffer), anchor_(), selection_(false), mark_(false),
word_selection_(false), autocorrect_(false), current_font(inherit_font)
word_selection_(false), current_font(inherit_font)
{}
CursorData::CursorData(DocIterator const & dit)
: DocIterator(dit), anchor_(), selection_(false), mark_(false),
word_selection_(false), autocorrect_(false), current_font(inherit_font)
word_selection_(false), current_font(inherit_font)
{}

7
src/Cursor.h
View File

@ -160,11 +160,6 @@ public:
///
docstring currentState(bool devel_mode) const;
/// auto-correct mode
bool autocorrect() const { return autocorrect_; }
/// auto-correct mode
bool & autocorrect() { return autocorrect_; }
/// fix cursor in circumstances that should never happen.
/// \retval true if a fix occurred.
bool fixIfBroken();
@ -238,8 +233,6 @@ private:
//
// math specific stuff that could be promoted to "global" later
//
/// do we allow autocorrection
bool autocorrect_;
// FIXME: make them private
public:

26
src/mathed/InsetMathNest.cpp
View File

@ -706,12 +706,6 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
|| act == LFUN_PARAGRAPH_UP_SELECT;
cur.selHandle(select);
// handle autocorrect:
if (lyxrc.autocorrection_math && cur.autocorrect()) {
cur.autocorrect() = false;
cur.message(_("Autocorrect Off ('!' to enter)"));
}
// go up/down
bool up = act == LFUN_UP || act == LFUN_UP_SELECT
|| act == LFUN_PARAGRAPH_UP || act == LFUN_PARAGRAPH_UP_SELECT;
@ -1729,18 +1723,6 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c)
}
// leave autocorrect mode if necessary
if (lyxrc.autocorrection_math && c == ' ' && cur.autocorrect()) {
cur.autocorrect() = false;
cur.message(_("Autocorrect Off ('!' to enter)"));
return true;
}
if (lyxrc.autocorrection_math && c == '!' && !cur.autocorrect()) {
cur.autocorrect() = true;
cur.message(_("Autocorrect On (<space> to exit)"));
return true;
}
// just clear selection on pressing the space bar
if (cur.selection() && c == ' ') {
cur.selection(false);
@ -1867,18 +1849,12 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c)
// try auto-correction
if (lyxrc.autocorrection_math && cur.autocorrect() && cur.pos() != 0
if (lyxrc.autocorrection_math && cur.pos() != 0
&& math_autocorrect(cur, c))
return true;
// no special circumstances, so insert the character without any fuss
cur.insert(c);
if (lyxrc.autocorrection_math) {
if (!cur.autocorrect())
cur.message(_("Autocorrect Off ('!' to enter)"));
else
cur.message(_("Autocorrect On (<space> to exit)"));
}
return true;
}