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

Fix cursor movement with multicell selections. There's no point allowing character by character selection in this case.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26103 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-08-09 00:43:15 +00:00
parent 939503ee85
commit 6f77b93572
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/insets/InsetTabular.cpp
View File

@ -3235,6 +3235,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
moveNextCell(cur);
cur.selection() = false;
break;
case LFUN_CHAR_FORWARD_SELECT:
case LFUN_CHAR_FORWARD:
case LFUN_CHAR_BACKWARD_SELECT:
@ -3243,7 +3244,6 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_CHAR_RIGHT:
case LFUN_CHAR_LEFT_SELECT:
case LFUN_CHAR_LEFT: {
// determine whether we move to next or previous cell, where to enter
// the new cell from, and which command to "finish" (i.e., exit the
// inset) with:
@ -3277,24 +3277,34 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
else
finish_lfun = LFUN_FINISHED_LEFT;
}
// finally, now that we know what we want to do, do it!
cell(cur.idx())->dispatch(cur, cmd);
if (!cur.result().dispatched()) {
// move to next/prev cell, as appropriate
LYXERR(Debug::RTL, "entering " << (next_cell ? "next" : "previous")
<< " cell from: " << int(entry_from));
if (next_cell)
moveNextCell(cur, entry_from);
else
movePrevCell(cur, entry_from);
// if we're exiting the table, call the appropriate FINISHED lfun
if (sl == cur.top())
cmd = FuncRequest(finish_lfun);
else
cur.dispatched();
// if we don't have a multicell selection...
if (!cur.selection() ||
cur.selBegin().idx() == cur.selEnd().idx() ||
// ...or we're not doing some LFUN_*_SELECT thing, anyway...
(cmd.action != LFUN_CHAR_FORWARD_SELECT &&
cmd.action != LFUN_CHAR_BACKWARD_SELECT &&
cmd.action != LFUN_CHAR_RIGHT_SELECT &&
cmd.action != LFUN_CHAR_LEFT_SELECT)) {
// ...try to dispatch to the cell's inset.
cell(cur.idx())->dispatch(cur, cmd);
if (cur.result().dispatched())
break;
}
// move to next/prev cell, as appropriate
// note that we will always do this if we're selecting and we have
// a multicell selection
LYXERR(Debug::RTL, "entering " << (next_cell ? "next" : "previous")
<< " cell from: " << int(entry_from));
if (next_cell)
moveNextCell(cur, entry_from);
else
movePrevCell(cur, entry_from);
// if we're exiting the table, call the appropriate FINISHED lfun
if (sl == cur.top())
cmd = FuncRequest(finish_lfun);
else
cur.dispatched();
break;
}