bool MathGridInset::idxUpDown(LCursor & cur, bool up) const
{
if (up) {
- if (cur.idx() < ncols())
+ if (cur.row() == 0)
return false;
cur.idx() -= ncols();
} else {
- if (cur.row() >= nrows())
+ if (cur.row() + 1 >= nrows())
return false;
cur.idx() += ncols();
}
// insert file functions
case LFUN_DELETE_LINE_FORWARD:
- recordUndo(cur);
+ // FIXME: We use recordUndoInset when a change reflects more
+ // than one cell, because recordUndo does not work for
+ // multiple cells. Unfortunately this puts the cursor in front
+ // of the inset after undo. This is (especilally for large
+ // grids) annoying.
+ recordUndoInset(cur);
//autocorrect_ = false;
//macroModeClose();
//if (selection_) {
splitCell(cur);
break;
+ case LFUN_CELL_BACKWARD:
+ // See below.
+ cur.selection() = false;
+ if (!idxPrev(cur)) {
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ cur.undispatched();
+ }
+ break;
+
+ case LFUN_CELL_FORWARD:
+ // Can't handle selection by additional 'shift' as this is
+ // hard bound to LFUN_CELL_BACKWARD
+ cur.selection() = false;
+ if (!idxNext(cur)) {
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ cur.undispatched();
+ }
+ break;
+
case LFUN_BREAKLINE: {
- recordUndo(cur);
+ recordUndoInset(cur);
row_type const r = cur.row();
addRow(r);
}
case LFUN_TABULAR_FEATURE: {
- recordUndo(cur);
+ recordUndoInset(cur);
//lyxerr << "handling tabular-feature " << cmd.argument << endl;
istringstream is(cmd.argument);
string s;
}
case LFUN_PASTE: {
- recordUndo(cur);
lyxerr << "MathGridInset: PASTE: " << cmd << std::endl;
istringstream is(cmd.argument);
int n = 0;
mathed_parse_normal(grid, lyx::cap::getSelection(cur.buffer(), n));
if (grid.nargs() == 1) {
// single cell/part of cell
+ recordUndo(cur);
cur.cell().insert(cur.pos(), grid.cell(0));
cur.pos() += grid.cell(0).size();
} else {
// multiple cells
+ recordUndoInset(cur);
col_type const numcols =
min(grid.ncols(), ncols() - col(cur.idx()));
row_type const numrows =
bool MathGridInset::getStatus(LCursor & cur, FuncRequest const & cmd,
- FuncStatus & flag) const
+ FuncStatus & status) const
{
switch (cmd.action) {
case LFUN_TABULAR_FEATURE: {
string const s = cmd.argument;
if (nrows() <= 1 && (s == "delete-row" || s == "swap-row")) {
- flag.enabled(false);
- flag.message(N_("Only one row"));
+ status.enabled(false);
+ status.message(N_("Only one row"));
return true;
}
if (ncols() <= 1 &&
(s == "delete-column" || s == "swap-column")) {
- flag.enabled(false);
- flag.message(N_("Only one column"));
+ status.enabled(false);
+ status.message(N_("Only one column"));
return true;
}
if ((rowinfo_[cur.row()].lines_ == 0 &&
s == "delete-hline-above") ||
(rowinfo_[cur.row() + 1].lines_ == 0 &&
s == "delete-hline-below")) {
- flag.enabled(false);
- flag.message(N_("No hline to delete"));
+ status.enabled(false);
+ status.message(N_("No hline to delete"));
return true;
}
s == "delete-vline-left") ||
(colinfo_[cur.col() + 1].lines_ == 0 &&
s == "delete-vline-right")) {
- flag.enabled(false);
- flag.message(N_("No vline to delete"));
+ status.enabled(false);
+ status.message(N_("No vline to delete"));
return true;
}
if (s == "valign-top" || s == "valign-middle" ||
s == "copy-column" || s == "swap-column" ||
s == "add-vline-left" || s == "add-vline-right" ||
s == "delete-vline-left" || s == "delete-vline-right")
- flag.enabled(true);
+ status.enabled(true);
else {
- flag.enabled(false);
- flag.message(bformat(
+ status.enabled(false);
+ status.message(bformat(
N_("Unknown tabular feature '%1$s'"), s));
}
- flag.setOnOff(s == "align-left" && halign(cur.col()) == 'l'
+ status.setOnOff(s == "align-left" && halign(cur.col()) == 'l'
|| s == "align-right" && halign(cur.col()) == 'r'
|| s == "align-center" && halign(cur.col()) == 'c'
|| s == "valign-top" && valign() == 't'
#if 0
// FIXME: What did this code do?
- // Please check wether it is still needed!
+ // Please check whether it is still needed!
// should be more precise
if (v_align_ == '\0') {
- flag.enable(true);
+ status.enable(true);
break;
}
if (cmd.argument.empty()) {
- flag.enable(false);
+ status.enable(false);
break;
}
if (!lyx::support::contains("tcb", cmd.argument[0])) {
- flag.enable(false);
+ status.enable(false);
break;
}
- flag.setOnOff(cmd.argument[0] == v_align_);
- flag.enabled(true);
+ status.setOnOff(cmd.argument[0] == v_align_);
+ status.enabled(true);
#endif
return true;
}
+
case LFUN_CELL_SPLIT:
- flag.enabled(true);
+ status.enabled(true);
+ return true;
+
+ case LFUN_CELL_BACKWARD:
+ case LFUN_CELL_FORWARD:
+ status.enabled(true);
return true;
+
default:
- return MathNestInset::getStatus(cur, cmd, flag);
+ return MathNestInset::getStatus(cur, cmd, status);
}
}