anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-07 09:46:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not record undo in the tabularFeatures helper

Browse Source 
Since the low-level version of tabular features is only called by the high-level one, it does not make sense to record undo there. It is much better to do it once in the high-level handler, rather than 37 times (yes!) at lower level when the tabular GUI calls tabular-feature with all the settings at once.

With large tables, this avoids to keep 37 copies of the table in Undo stack.
This commit is contained in:
Jean-Marc Lasgouttes 2016-02-09 16:37:50 +01:00
parent 8d9e4a3fd3
commit 942b62ac0f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/InsetTabular.cpp
View File

@ -5348,6 +5348,8 @@ void InsetTabular::movePrevCell(Cursor & cur, EntryDirection entry_from)
bool InsetTabular::tabularFeatures(Cursor & cur, string const & argument) bool InsetTabular::tabularFeatures(Cursor & cur, string const & argument)
{ {
cur.recordUndoInset(ATOMIC_UNDO, this);
istringstream is(argument); istringstream is(argument);
string s; string s;
is >> s; is >> s;
@ -5479,8 +5481,6 @@ void InsetTabular::tabularFeatures(Cursor & cur,
break; break;
} }
cur.recordUndoInset(ATOMIC_UNDO, this);
getSelection(cur, sel_row_start, sel_row_end, sel_col_start, sel_col_end); getSelection(cur, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
row_type const row = tabular.cellRow(cur.idx()); row_type const row = tabular.cellRow(cur.idx());
col_type const column = tabular.cellColumn(cur.idx()); col_type const column = tabular.cellColumn(cur.idx());

4
src/insets/InsetTabular.h
View File

@ -882,9 +882,9 @@ public:
/// get offset of this cursor slice relative to our upper left corner /// get offset of this cursor slice relative to our upper left corner
void cursorPos(BufferView const & bv, CursorSlice const & sl, void cursorPos(BufferView const & bv, CursorSlice const & sl,
bool boundary, int & x, int & y) const; bool boundary, int & x, int & y) const;
/// /// Executes a space-separated sequence of tabular-features requests
bool tabularFeatures(Cursor & cur, std::string const & what); bool tabularFeatures(Cursor & cur, std::string const & what);
/// /// Change a single tabular feature; does not handle undo.
void tabularFeatures(Cursor & cur, Tabular::Feature feature, void tabularFeatures(Cursor & cur, Tabular::Feature feature,
std::string const & val = std::string()); std::string const & val = std::string());
/// number of cells /// number of cells

2
status.21x
View File

@ -156,6 +156,8 @@ What's new
- Allow quotes in PDF text properties (bug 9830). - Allow quotes in PDF text properties (bug 9830).
- Avoid clogging the undo stack with useless entries when using the
tabular dialog (bug 9960).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION