Tabular::CellData::CellData(Buffer * buf)
: cellno(0),
width(0),
+ height(0),
+ ascent(0),
+ descent(0),
multicolumn(Tabular::CELL_NORMAL),
multirow(Tabular::CELL_NORMAL),
alignment(LYX_ALIGN_CENTER),
endfoot(false),
endlastfoot(false),
newpage(false),
- caption(false)
+ caption(false),
+ valignment(LYX_VALIGN_TOP),
+ maxheight(0)
{}
CellData & cs = cellInfo(cell);
cs.multirow = CELL_BEGIN_OF_MULTIROW;
cs.valignment = LYX_VALIGN_MIDDLE;
+ // FIXME: the horizontal alignment of multirow cells can only
+ // be changed for the whole table,
+ // support for this needs to be implemented but us a fileformat
+ // change (assigning this to uwestoehr)
+ // until LyX supports this, use the deault alignment of multirow
+ // cells: left
+ cs.alignment = LYX_ALIGN_LEFT;
// set the bottom row of the last selected cell
setBottomLine(cell, bottomLine(cell + (number - 1)*ncols()));
return;
cellInfo(cell).valignment = LYX_VALIGN_TOP;
+ cellInfo(cell).alignment = LYX_ALIGN_CENTER;
row_type const row = cellRow(cell);
col_type const col = cellColumn(cell);
row_type const span = rowSpan(cell);
tabular.setCellWidth(cell, dim.wid);
maxAsc = max(maxAsc, dim.asc);
maxDesc = max(maxDesc, dim.des);
+
+ // store the height for every cell
+ // this is later needed in InsetTabular::draw to determine the valignment
+ int const top_space_cell = tabular.row_info[r].top_space_default ?
+ default_line_space :
+ tabular.row_info[r].top_space.inPixels(mi.base.textwidth);
+ int const bottom_space_cell = tabular.row_info[r].bottom_space_default ?
+ default_line_space :
+ tabular.cell_info[r][c].height = dim.asc + dim.des;
+ tabular.cell_info[r][c].ascent = dim.asc;
+ tabular.cell_info[r][c].descent = dim.des;
}
int const top_space = tabular.row_info[r].top_space_default ?
default_line_space :
dim.wid = tabular.width() + 2 * ADD_TO_TABULAR_WIDTH;
}
+
bool InsetTabular::isCellSelected(Cursor & cur, row_type row, col_type col)
const
{
bool const original_selection_state = pi.selected;
idx_type idx = 0;
+ int cy = 0;
first_visible_cell = Tabular::npos;
+
+ // determine the highest cell because its valignment sets the row valignment
+ // also store its height
+ for (row_type r = 0; r < tabular.nrows(); ++r) {
+ int nx = x;
+ for (col_type c = 0; c < tabular.ncols(); ++c) {
+ if (tabular.cell_info[r][c].height >= tabular.row_info[r].maxheight) {
+ tabular.row_info[r].maxheight = tabular.cell_info[r][c].height;
+ switch (tabular.getVAlignment(tabular.cellIndex(r, c))) {
+ case Tabular::LYX_VALIGN_TOP:
+ tabular.row_info[r].valignment = Tabular::LYX_VALIGN_TOP;
+ break;
+ case Tabular::LYX_VALIGN_MIDDLE:
+ tabular.row_info[r].valignment = Tabular::LYX_VALIGN_MIDDLE;
+ break;
+ case Tabular::LYX_VALIGN_BOTTOM:
+ tabular.row_info[r].valignment = Tabular::LYX_VALIGN_BOTTOM;
+ break;
+ }
+ }
+ }
+ }
+
+ // step over all cells
for (row_type r = 0; r < tabular.nrows(); ++r) {
int nx = x;
for (col_type c = 0; c < tabular.ncols(); ++c) {
first_visible_cell = idx;
pi.selected |= isCellSelected(cur, r, c);
+
+ // set the position for the vertical alignment
+ // if the cell is not the highest, align it according to the row valignment
+ // and according to its own valignment
+ // Note: The fractions of the scent values were found by testing
+ // there is no bettwer way for the calculation because of LyX's definition
+ // of ascent and descent. The correct way would be to calculate based
+ // on the text height, the line space and paragraph separation.
+ cy = y;
+ if (tabular.cell_info[r][c].height < tabular.row_info[r].maxheight) {
+ switch (tabular.row_info[r].valignment) {
+ case Tabular::LYX_VALIGN_TOP:
+ switch (tabular.getVAlignment(idx)) {
+ case Tabular::LYX_VALIGN_TOP:
+ break;
+ case Tabular::LYX_VALIGN_MIDDLE:
+ cy += - tabular.cell_info[r][c].descent / 2
+ + 0.3 * tabular.cell_info[r][c].ascent;
+ // FIXME the row also needs to be increased at the upper border
+ break;
+ case Tabular::LYX_VALIGN_BOTTOM:
+ cy += - tabular.cell_info[r][c].descent
+ + 0.6 * tabular.cell_info[r][c].ascent;
+ // FIXME the row also needs to be increased at the upper border
+ break;
+ }
+ break;
+ case Tabular::LYX_VALIGN_MIDDLE:
+ switch (tabular.getVAlignment(idx)) {
+ case Tabular::LYX_VALIGN_TOP:
+ cy += tabular.row_info[r].maxheight / 2
+ - 0.75 * tabular.cell_info[r][c].ascent;
+ break;
+ case Tabular::LYX_VALIGN_MIDDLE:
+ cy += tabular.row_info[r].maxheight / 2
+ - tabular.cell_info[r][c].descent / 2
+ - 0.5 * tabular.cell_info[r][c].ascent;
+ break;
+ case Tabular::LYX_VALIGN_BOTTOM:
+ cy += tabular.row_info[r].maxheight / 2
+ - tabular.cell_info[r][c].descent
+ - 0.2 * tabular.cell_info[r][c].ascent;
+ break;
+ }
+ break;
+ case Tabular::LYX_VALIGN_BOTTOM:
+ switch (tabular.getVAlignment(idx)) {
+ case Tabular::LYX_VALIGN_TOP:
+ cy += tabular.row_info[r].maxheight
+ - 1.5 * tabular.cell_info[r][c].ascent;
+ break;
+ case Tabular::LYX_VALIGN_MIDDLE:
+ cy += tabular.row_info[r].maxheight
+ - tabular.cell_info[r][c].descent / 2
+ - 1.2 * tabular.cell_info[r][c].ascent;
+ // FIXME the row also needs to be increased at the lower border
+ break;
+ case Tabular::LYX_VALIGN_BOTTOM:
+ cy += tabular.row_info[r].maxheight
+ - tabular.cell_info[r][c].descent
+ - 0.9 * tabular.cell_info[r][c].ascent;
+ // FIXME the row also needs to be increased at the lower border
+ break;
+ }
+ break;
+ }
+ }
+
int const cx = nx + tabular.textHOffset(idx);
- int const cy = y + tabular.textVOffset(idx);
// Cache the Inset position.
bv->coordCache().insets().add(cell(idx).get(), cx, cy);
cell(idx)->draw(pi, cx, cy);
void InsetTabular::drawCellLines(Painter & pain, int x, int y,
- row_type row, idx_type cell, Change const & change) const
+ row_type row, idx_type cell, Change const & change) const
{
- y = y - tabular.rowAscent(row);
+ y -= tabular.rowAscent(row);
int const w = tabular.columnWidth(cell);
int const h = tabular.cellHeight(cell);
- bool on_off = false;
- Color col = Color_tabularline;
- Color onoffcol = Color_tabularonoffline;
+ Color linecolor = change.changed() ? change.color() : Color_tabularline;
+ Color gridcolor = change.changed() ? change.color() : Color_tabularonoffline;
- if (change.changed()) {
- col = change.color();
- onoffcol = change.color();
- }
-
- bool topalreadydrawn = row > 0 && !tabular.rowTopLine(row)
+ // Top
+ bool drawline = tabular.topLine(cell) || row > 0
&& tabular.bottomLine(tabular.cellAbove(cell));
+ pain.line(x, y, x + w, y,
+ drawline ? linecolor : gridcolor,
+ drawline ? Painter::line_solid : Painter::line_onoffdash);
- if (!topalreadydrawn) {
- on_off = !tabular.topLine(cell);
- pain.line(x, y, x + w, y,
- on_off ? onoffcol : col,
- on_off ? Painter::line_onoffdash : Painter::line_solid);
- }
- on_off = !tabular.bottomLine(cell);
+ // Bottom
+ drawline = tabular.bottomLine(cell);
pain.line(x, y + h, x + w, y + h,
- on_off ? onoffcol : col,
- on_off ? Painter::line_onoffdash : Painter::line_solid);
-
- col_type const column = tabular.cellColumn(cell);
- bool leftalreadydrawn = column > 0 && !tabular.leftLine(cell)
- && tabular.rightLine(tabular.cellIndex(row, column - 1));
-
- if (!leftalreadydrawn) {
- on_off = !tabular.leftLine(cell);
- pain.line(x, y, x, y + h,
- on_off ? onoffcol : col,
- on_off ? Painter::line_onoffdash : Painter::line_solid);
- }
- on_off = !tabular.rightLine(cell);
- pain.line(x + w - tabular.interColumnSpace(cell), y,
- x + w - tabular.interColumnSpace(cell), y + h,
- on_off ? onoffcol : col,
- on_off ? Painter::line_onoffdash : Painter::line_solid);
+ drawline ? linecolor : gridcolor,
+ drawline ? Painter::line_solid : Painter::line_onoffdash);
+
+ // Left
+ col_type const col = tabular.cellColumn(cell);
+ drawline = tabular.leftLine(cell) || col > 0
+ && tabular.rightLine(tabular.cellIndex(row, col - 1));
+ pain.line(x, y, x, y + h,
+ drawline ? linecolor : gridcolor,
+ drawline ? Painter::line_solid : Painter::line_onoffdash);
+
+ // Right
+ x -= tabular.interColumnSpace(cell);
+ drawline = tabular.rightLine(cell) || col + 1 < tabular.ncols()
+ && tabular.leftLine(tabular.cellIndex(row, col + 1));
+ pain.line(x + w, y, x + w, y + h,
+ drawline ? linecolor : gridcolor,
+ drawline ? Painter::line_solid : Painter::line_onoffdash);
}
projects / lyx.git / blobdiff