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

Get rid of InsetTabular::first_visible_cell_

Browse Source 
The code that uses it has been commented out since 2004. It is time to
delete it.
This commit is contained in:
Jean-Marc Lasgouttes 2016-07-18 12:24:31 +02:00
parent 61188464b4
commit 31120694d9
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/insets/InsetTabular.cpp
View File

@ -3487,14 +3487,14 @@ docstring InsetTableCell::xhtml(XHTMLStream & xs, OutputParams const & rp) const
InsetTabular::InsetTabular(Buffer * buf, row_type rows, InsetTabular::InsetTabular(Buffer * buf, row_type rows,
col_type columns) col_type columns)
: Inset(buf), tabular(buf, max(rows, row_type(1)), max(columns, col_type(1))), : Inset(buf), tabular(buf, max(rows, row_type(1)), max(columns, col_type(1))),
first_visible_cell_(0), offset_valign_(0), rowselect_(false), colselect_(false) offset_valign_(0), rowselect_(false), colselect_(false)
{ {
} }
InsetTabular::InsetTabular(InsetTabular const & tab) InsetTabular::InsetTabular(InsetTabular const & tab)
: Inset(tab), tabular(tab.tabular), : Inset(tab), tabular(tab.tabular),
first_visible_cell_(0), offset_valign_(0), rowselect_(false), colselect_(false) offset_valign_(0), rowselect_(false), colselect_(false)
{ {
} }
@ -3757,7 +3757,6 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
bool const original_selection_state = pi.selected; bool const original_selection_state = pi.selected;
idx_type idx = 0; idx_type idx = 0;
first_visible_cell_ = Tabular::npos;
int yy = y + offset_valign_; int yy = y + offset_valign_;
for (row_type r = 0; r < tabular.nrows(); ++r) { for (row_type r = 0; r < tabular.nrows(); ++r) {
@ -3773,9 +3772,6 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
continue; continue;
} }
if (first_visible_cell_ == Tabular::npos)
first_visible_cell_ = idx;
pi.selected |= isCellSelected(cur, r, c); pi.selected |= isCellSelected(cur, r, c);
int const cx = nx + tabular.textHOffset(idx); int const cx = nx + tabular.textHOffset(idx);
int const cy = yy + tabular.textVOffset(idx); int const cy = yy + tabular.textVOffset(idx);
@ -4297,41 +4293,6 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
cur.screenUpdateFlags(Update::Force | Update::FitCursor); cur.screenUpdateFlags(Update::Force | Update::FitCursor);
break; break;
// case LFUN_SCREEN_DOWN: {
// //if (hasSelection())
// // cur.selection() = false;
// col_type const col = tabular.cellColumn(cur.idx());
// int const t = cur.bv().top_y() + cur.bv().height();
// if (t < yo() + tabular.getHeightOfTabular()) {
// cur.bv().scrollDocView(t, true);
// cur.idx() = tabular.cellBelow(first_visible_cell_) + col;
// } else {
// cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + col;
// }
// cur.par() = 0;
// cur.pos() = 0;
// break;
// }
//
// case LFUN_SCREEN_UP: {
// //if (hasSelection())
// // cur.selection() = false;
// col_type const col = tabular.cellColumn(cur.idx());
// int const t = cur.bv().top_y() + cur.bv().height();
// if (yo() < 0) {
// cur.bv().scrollDocView(t, true);
// if (yo() > 0)
// cur.idx() = col;
// else
// cur.idx() = tabular.cellBelow(first_visible_cell_) + col;
// } else {
// cur.idx() = col;
// }
// cur.par() = cur.lastpar();
// cur.pos() = cur.lastpos();
// break;
// }
case LFUN_LAYOUT_TABULAR: case LFUN_LAYOUT_TABULAR:
cur.bv().showDialog("tabular"); cur.bv().showDialog("tabular");
break; break;

2
src/insets/InsetTabular.h
View File

@ -1055,8 +1055,6 @@ private:
bool oneCellHasRotationState(bool rotated, bool oneCellHasRotationState(bool rotated,
row_type row_start, row_type row_end, row_type row_start, row_type row_end,
col_type col_start, col_type col_end) const; col_type col_start, col_type col_end) const;
///
mutable idx_type first_visible_cell_;
/// The vertical offset of the table due to the vertical /// The vertical offset of the table due to the vertical
/// alignment with respect to the baseline. /// alignment with respect to the baseline.
mutable int offset_valign_; mutable int offset_valign_;