anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix sideways scrolling in tabulars with nested insets

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26347 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2008-09-09 14:12:08 +00:00
parent a4610848dc
commit fab42d011c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/insets/InsetTabular.cpp
View File

@ -4002,14 +4002,16 @@ void InsetTabular::resetPos(Cursor & cur) const
BufferView & bv = cur.bv();
int const maxwidth = bv.workWidth();
if (&cur.inset() != this) {
int const scx_old = scx_;
int const i = cur.find(this);
if (i == -1) {
scx_ = 0;
} else {
int const X1 = 0;
int const X2 = maxwidth;
int const offset = ADD_TO_TABULAR_WIDTH + 2;
int const x1 = xo(cur.bv()) + cellXPos(cur.idx()) + offset;
int const x2 = x1 + tabular.columnWidth(cur.idx());
int const x1 = xo(cur.bv()) + cellXPos(cur[i].idx()) + offset;
int const x2 = x1 + tabular.columnWidth(cur[i].idx());
if (x1 < X1)
scx_ = X1 + 20 - x1;
@ -4019,7 +4021,9 @@ void InsetTabular::resetPos(Cursor & cur) const
scx_ = 0;
}
cur.updateFlags(Update::Force | Update::FitCursor);
// only update if offset changed
if (scx_ != scx_old)
cur.updateFlags(Update::Force | Update::FitCursor);
}
@ -4103,8 +4107,7 @@ void InsetTabular::movePrevCell(Cursor & cur, EntryDirection entry_from)
}
// FIXME: this accesses the position cache before it is initialized
//resetPos(cur);
resetPos(cur);
}