anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bottom border allocation when setting a multirow.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39755 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-09-25 06:36:58 +00:00
parent 082cd0ce69
commit 4619ec4637
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/insets/InsetTabular.cpp
View File

@ -1649,7 +1649,8 @@ bool Tabular::isMultiRow(idx_type cell) const
}
Tabular::idx_type Tabular::setMultiRow(idx_type cell, idx_type number)
Tabular::idx_type Tabular::setMultiRow(idx_type cell, idx_type number,
bool const bottom_border)
{
idx_type const col = cellColumn(cell);
idx_type const row = cellRow(cell);
@ -1670,8 +1671,8 @@ Tabular::idx_type Tabular::setMultiRow(idx_type cell, idx_type number)
// cells: left
cs.alignment = LYX_ALIGN_LEFT;
// set the bottom row of the last selected cell
setBottomLine(cell, bottomLine(cell + (number - 1)*ncols()));
// set the bottom line of the last selected cell
setBottomLine(cell, bottom_border);
for (idx_type i = 1; i < number; ++i) {
CellData & cs1 = cell_info[row + i][col];
@ -5399,7 +5400,8 @@ void InsetTabular::tabularFeatures(Cursor & cur,
// just multirow for one single cell
// check whether we are completely in a multirow
if (!tabular.isMultiRow(cur.idx()))
tabular.setMultiRow(cur.idx(), 1);
tabular.setMultiRow(cur.idx(), 1,
tabular.bottomLine(cur.idx()));
break;
}
// we have a selection so this means we just add all this
@ -5407,7 +5409,8 @@ void InsetTabular::tabularFeatures(Cursor & cur,
idx_type const s_start = cur.selBegin().idx();
row_type const row_start = tabular.cellRow(s_start);
row_type const row_end = tabular.cellRow(cur.selEnd().idx());
cur.idx() = tabular.setMultiRow(s_start, row_end - row_start + 1);
cur.idx() = tabular.setMultiRow(s_start, row_end - row_start + 1,
tabular.bottomLine(cur.selEnd().idx()));
cur.pit() = 0;
cur.pos() = 0;
cur.setSelection(false);

3
src/insets/InsetTabular.h
View File

@ -475,7 +475,8 @@ public:
///
bool isMultiRow(idx_type cell) const;
///
idx_type setMultiRow(idx_type cell, idx_type number);
idx_type setMultiRow(idx_type cell, idx_type number,
bool const bottom_border);
///
void unsetMultiRow(idx_type cell);
///

2
status.20x
View File

@ -105,6 +105,8 @@ What's new
- Fix Horizontal Space dialog when issued from within math (bug 7746).
- Fix bottom border allocation when setting a multirow (bug 7791).
- Disable interword and protected space lfuns in math, since these spaces
are not yet supported.