anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7059: Display the vertical alignment of tables.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36486 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-11-25 13:20:56 +00:00
parent 2b44b0ef4d
commit 0fd75fefc4
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/insets/InsetTabular.cpp
View File

@ -3357,7 +3357,7 @@ void InsetTabular::read(Lexer & lex)
int InsetTabular::rowFromY(Cursor & cur, int y) const int InsetTabular::rowFromY(Cursor & cur, int y) const
{ {
// top y coordinate of tabular // top y coordinate of tabular
int h = yo(cur.bv()) - tabular.rowAscent(0); int h = yo(cur.bv()) - tabular.rowAscent(0) + offset_valign_;
row_type r = 0; row_type r = 0;
for (; r < tabular.nrows() && y > h; ++r) for (; r < tabular.nrows() && y > h; ++r)
h += tabular.rowAscent(r) + tabular.rowDescent(r) h += tabular.rowAscent(r) + tabular.rowDescent(r)
@ -3463,8 +3463,21 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
tabular.row_info[r].bottom_space.inPixels(mi.base.textwidth); tabular.row_info[r].bottom_space.inPixels(mi.base.textwidth);
tabular.setRowDescent(r, maxdes + ADD_TO_HEIGHT + bottom_space); tabular.setRowDescent(r, maxdes + ADD_TO_HEIGHT + bottom_space);
} }
switch (tabular.tabular_valignment) {
case Tabular::LYX_VALIGN_BOTTOM:
offset_valign_ = tabular.rowAscent(0) - tabular.height();
break;
case Tabular::LYX_VALIGN_MIDDLE:
offset_valign_ = (tabular.rowAscent(0) - tabular.height()) / 2;
break;
case Tabular::LYX_VALIGN_TOP:
offset_valign_ = 0;
break;
}
tabular.updateColumnWidths(); tabular.updateColumnWidths();
dim.asc = tabular.rowAscent(0); dim.asc = tabular.rowAscent(0) - offset_valign_;
dim.des = tabular.height() - dim.asc; dim.des = tabular.height() - dim.asc;
dim.wid = tabular.width() + 2 * ADD_TO_TABULAR_WIDTH; dim.wid = tabular.width() + 2 * ADD_TO_TABULAR_WIDTH;
} }
@ -3517,6 +3530,8 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
idx_type idx = 0; idx_type idx = 0;
first_visible_cell = Tabular::npos; first_visible_cell = Tabular::npos;
int yy = y + offset_valign_;
for (row_type r = 0; r < tabular.nrows(); ++r) { for (row_type r = 0; r < tabular.nrows(); ++r) {
int nx = x; int nx = x;
for (col_type c = 0; c < tabular.ncols(); ++c) { for (col_type c = 0; c < tabular.ncols(); ++c) {
@ -3535,17 +3550,17 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
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 = y + tabular.textVOffset(idx); int const cy = yy + tabular.textVOffset(idx);
// Cache the Inset position. // Cache the Inset position.
bv->coordCache().insets().add(cell(idx).get(), cx, cy); bv->coordCache().insets().add(cell(idx).get(), cx, cy);
cell(idx)->draw(pi, cx, cy); cell(idx)->draw(pi, cx, cy);
drawCellLines(pi, nx, y, r, idx); drawCellLines(pi, nx, yy, r, idx);
nx += tabular.cellWidth(idx); nx += tabular.cellWidth(idx);
pi.selected = original_selection_state; pi.selected = original_selection_state;
} }
if (r + 1 < tabular.nrows()) if (r + 1 < tabular.nrows())
y += tabular.rowDescent(r) + tabular.rowAscent(r + 1) yy += tabular.rowDescent(r) + tabular.rowAscent(r + 1)
+ tabular.interRowSpace(r + 1); + tabular.interRowSpace(r + 1);
} }
} }
@ -3554,7 +3569,7 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
void InsetTabular::drawBackground(PainterInfo & pi, int x, int y) const void InsetTabular::drawBackground(PainterInfo & pi, int x, int y) const
{ {
x += scx_ + ADD_TO_TABULAR_WIDTH; x += scx_ + ADD_TO_TABULAR_WIDTH;
y -= tabular.rowAscent(0); y += offset_valign_ - tabular.rowAscent(0);
pi.pain.fillRectangle(x, y, tabular.width(), tabular.height(), pi.pain.fillRectangle(x, y, tabular.width(), tabular.height(),
pi.backgroundColor(this)); pi.backgroundColor(this));
} }
@ -3592,7 +3607,7 @@ void InsetTabular::drawSelection(PainterInfo & pi, int x, int y) const
} }
int const w = tabular.cellWidth(cell); int const w = tabular.cellWidth(cell);
int const h = tabular.cellHeight(cell); int const h = tabular.cellHeight(cell);
int const yy = y - tabular.rowAscent(r); int const yy = y - tabular.rowAscent(r) + offset_valign_;
if (isCellSelected(cur, r, c)) if (isCellSelected(cur, r, c))
pi.pain.fillRectangle(xx, yy, w, h, Color_selection); pi.pain.fillRectangle(xx, yy, w, h, Color_selection);
xx += w; xx += w;
@ -3740,7 +3755,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
break; break;
} }
// select column // select column
int const y0 = yo(cur.bv()) - tabular.rowAscent(0); int const y0 = yo(cur.bv()) - tabular.rowAscent(0) + offset_valign_;
if (cmd.y() < y0 + ADD_TO_TABULAR_WIDTH if (cmd.y() < y0 + ADD_TO_TABULAR_WIDTH
|| cmd.y() > y0 + tabular.height()) { || cmd.y() > y0 + tabular.height()) {
col_type c = columnFromX(cur, cmd.x()); col_type c = columnFromX(cur, cmd.x());
@ -4714,6 +4729,7 @@ void InsetTabular::cursorPos(BufferView const & bv,
+ tabular.interRowSpace(r + 1); + tabular.interRowSpace(r + 1);
y += tabular.textVOffset(sl.idx()); y += tabular.textVOffset(sl.idx());
y += offset_valign_;
// x offset correction // x offset correction
for (int c = 0; c < col; ++c) for (int c = 0; c < col; ++c)

3
src/insets/InsetTabular.h
View File

@ -954,6 +954,9 @@ private:
mutable idx_type first_visible_cell; mutable idx_type first_visible_cell;
/// ///
mutable int scx_; mutable int scx_;
/// The vertical offset of the table due to the vertical
/// alignment with respect to the baseline.
mutable int offset_valign_;
/// true when selecting rows with the mouse /// true when selecting rows with the mouse
bool rowselect_; bool rowselect_;
/// true when selecting columns with the mouse /// true when selecting columns with the mouse