anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix cursor UP/DOWN movements in tabulars

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10319 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2005-07-18 10:24:35 +00:00
parent 73b86ad30c
commit 18ed7fe334
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2005-07-18 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* insettabular.C (doDispatch): try to fix handling of cursor UP/DOWN.
2005-07-17 Lars Gullik Bjønnes <larsbj@lyx.org>
* insetlabel.C (changeRefsIfUnique): remove unused code

19
src/insets/insettabular.C
View File

@ -521,13 +521,19 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
cell(cur.idx())->dispatch(cur, cmd);
cur.dispatched(); // override the cell's decision
if (sl == cur.top())
// if our LyXText didn't do anything to the cursor
// then we try to put the cursor into the cell below
// setting also the right targetX.
if (tabular.row_of_cell(cur.idx()) != tabular.rows() - 1) {
cur.idx() = tabular.getCellBelow(cur.idx());
cur.pit() = 0;
cur.pos() = 0;
cur.pos() = cell(cur.idx())->getText(0)->x2pos(
cur.pit(), 0, cur.targetX());
}
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_DOWN);
// we trick it to go to the RIGHT after leaving the
// tabular.
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
cur.undispatched();
}
break;
@ -537,10 +543,17 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
cell(cur.idx())->dispatch(cur, cmd);
cur.dispatched(); // override the cell's decision
if (sl == cur.top())
// if our LyXText didn't do anything to the cursor
// then we try to put the cursor into the cell above
// setting also the right targetX.
if (tabular.row_of_cell(cur.idx()) != 0) {
cur.idx() = tabular.getCellAbove(cur.idx());
cur.pit() = cur.lastpit();
cur.pos() = cur.lastpos();
LyXText const * text = cell(cur.idx())->getText(0);
cur.pos() = text->x2pos(
cur.pit(),
text->paragraphs().back().rows().size()-1,
cur.targetX());
}
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_UP);