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

branch: Fix bug #7007: Horizontal table alignment display broken.

Browse Source 
see r36395, r36401 and r36402.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36590 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-11-29 12:56:42 +00:00
parent f839b04573
commit ef0be6ac18
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/insets/InsetTabular.cpp
View File

@ -946,11 +946,22 @@ void Tabular::setCellWidth(idx_type cell, int new_width)
void Tabular::setAlignment(idx_type cell, LyXAlignment align,
bool onlycolumn)
{
if (!isMultiColumn(cell) || onlycolumn)
column_info[cellColumn(cell)].alignment = align;
if (!onlycolumn)
col_type const col = cellColumn(cell);
row_type const nrows = row_info.size();
// set alignment for the whole row if we are not in a multicolumn cell
// exclude possible multicolumn cells in the row
if (!isMultiColumn(cell)) {
for (row_type r = 0; r < nrows; ++r) {
if (!isMultiColumn(cellIndex(r, col))) {
cell_info[r][col].alignment = align;
cell_info[r][col].inset->setContentAlignment(align);
}
}
column_info[col].alignment = align;
} else {
cellInfo(cell).alignment = align;
cellInset(cell).get()->setContentAlignment(align);
cellInset(cell).get()->setContentAlignment(align);
}
}
@ -4594,14 +4605,13 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::M_ALIGN_LEFT:
case Tabular::M_ALIGN_RIGHT:
case Tabular::M_ALIGN_CENTER:
flag = false;
case Tabular::ALIGN_LEFT:
case Tabular::ALIGN_RIGHT:
case Tabular::ALIGN_CENTER:
case Tabular::ALIGN_BLOCK:
for (row_type i = sel_row_start; i <= sel_row_end; ++i)
for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setAlignment(tabular.cellIndex(i, j), setAlign, flag);
tabular.setAlignment(tabular.cellIndex(i, j), setAlign);
break;
case Tabular::M_VALIGN_TOP:

2
status.16x
View File

@ -79,6 +79,8 @@ What's new
- Do not allow to put the cursor in an InsetInfo. Instead, a context
menu item is added to facilitate copying of the contents (bug 5446).
- Fix the display of the horizontal alignment of table cells (bug 7007).
* DOCUMENTATION AND LOCALIZATION