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 bug 1815

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10285 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2005-07-17 14:23:33 +00:00
parent c410c393ad
commit 575bb2a15a
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/insets/insettabular.C
View File

@ -501,7 +501,6 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
cur.undispatched();
resetPos(cur);
}
break;
@ -514,7 +513,6 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_LEFT);
cur.undispatched();
resetPos(cur);
}
break;
@ -527,12 +525,10 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
cur.idx() = tabular.getCellBelow(cur.idx());
cur.pit() = 0;
cur.pos() = 0;
resetPos(cur);
}
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_DOWN);
cur.undispatched();
resetPos(cur);
}
break;
@ -545,12 +541,10 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
cur.idx() = tabular.getCellAbove(cur.idx());
cur.pit() = cur.lastpit();
cur.pos() = cur.lastpos();
resetPos(cur);
}
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_UP);
cur.undispatched();
resetPos(cur);
}
break;
@ -567,7 +561,6 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
// }
// cur.par() = 0;
// cur.pos() = 0;
// resetPos(cur);
// break;
// }
//
@ -587,7 +580,6 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
// }
// cur.par() = cur.lastpar();
// cur.pos() = cur.lastpos();
// resetPos(cur);
// break;
// }
@ -772,10 +764,10 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
default:
// we try to handle this event in the insets dispatch function.
cell(cur.idx())->dispatch(cur, cmd);
resetPos(cur);
break;
}
resetPos(cur);
InsetTabularMailer(*this).updateDialog(&cur.bv());
}

11
src/insets/insettext.C
View File

@ -190,16 +190,19 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
// update our idea of where we are
setPosCache(pi, x, y);
//BufferView * bv = pi.base.bv;
////bv->hideCursor();
text_.draw(pi, x + border_, y);
if (drawFrame_) {
int const w = text_.width() + 2 * border_;
int const a = text_.ascent() + border_;
int const h = a + text_.descent() + border_;
pi.pain.rectangle(x, y - a, w, h, frameColor());
int const ww = pi.base.bv->workWidth();
if (w > ww - 40) {
pi.pain.line(0, y - a, ww, y - a, frameColor());
pi.pain.line(0, y - a + h, ww, y - a + h, frameColor());
} else {
pi.pain.rectangle(x, y - a, w, h, frameColor());
}
}
}

2
src/tabular.C
View File

@ -800,7 +800,7 @@ void LyXTabular::recalculateMulticolumnsOfColumn(col_type column)
// always will have the whole rest of the width of the cell.
if (column > (columns_ - 2))
return;
for(row_type row = 0; row < rows_; ++row) {
for (row_type row = 0; row < rows_; ++row) {
int mc = cell_info[row][column].multicolumn;
int nmc = cell_info[row][column+1].multicolumn;
// we only have to update multicolumns which do not have this