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

Revert "Fix toggle-line for multi-cell selection"

Browse Source 
This changes the behavior of the table border toolbar in a way I am not sure everybody appreciates.

This reverts commit 022228e56f.
This commit is contained in:
Juergen Spitzmueller 2018-07-24 08:48:33 +02:00
parent d900b1fcec
commit 1883c4346d
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/insets/InsetTabular.cpp
View File

@ -5957,45 +5957,41 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::SET_LINE_TOP: case Tabular::SET_LINE_TOP:
case Tabular::TOGGLE_LINE_TOP: { case Tabular::TOGGLE_LINE_TOP: {
bool lineSet = (feature == Tabular::SET_LINE_TOP)
? (value == "true") : !tabular.topLine(cur.idx());
for (row_type r = sel_row_start; r <= sel_row_end; ++r) for (row_type r = sel_row_start; r <= sel_row_end; ++r)
for (col_type c = sel_col_start; c <= sel_col_end; ++c) { for (col_type c = sel_col_start; c <= sel_col_end; ++c)
bool const lineSet = (feature == Tabular::SET_LINE_TOP)
? (value == "true") : !tabular.topLine(tabular.cellIndex(r, c));
tabular.setTopLine(tabular.cellIndex(r, c), lineSet); tabular.setTopLine(tabular.cellIndex(r, c), lineSet);
}
break; break;
} }
case Tabular::SET_LINE_BOTTOM: case Tabular::SET_LINE_BOTTOM:
case Tabular::TOGGLE_LINE_BOTTOM: { case Tabular::TOGGLE_LINE_BOTTOM: {
bool lineSet = (feature == Tabular::SET_LINE_BOTTOM)
? (value == "true") : !tabular.bottomLine(cur.idx());
for (row_type r = sel_row_start; r <= sel_row_end; ++r) for (row_type r = sel_row_start; r <= sel_row_end; ++r)
for (col_type c = sel_col_start; c <= sel_col_end; ++c) { for (col_type c = sel_col_start; c <= sel_col_end; ++c)
bool const lineSet = (feature == Tabular::SET_LINE_BOTTOM)
? (value == "true") : !tabular.bottomLine(tabular.cellIndex(r, c));
tabular.setBottomLine(tabular.cellIndex(r, c), lineSet); tabular.setBottomLine(tabular.cellIndex(r, c), lineSet);
}
break; break;
} }
case Tabular::SET_LINE_LEFT: case Tabular::SET_LINE_LEFT:
case Tabular::TOGGLE_LINE_LEFT: { case Tabular::TOGGLE_LINE_LEFT: {
bool lineSet = (feature == Tabular::SET_LINE_LEFT)
? (value == "true") : !tabular.leftLine(cur.idx());
for (row_type r = sel_row_start; r <= sel_row_end; ++r) for (row_type r = sel_row_start; r <= sel_row_end; ++r)
for (col_type c = sel_col_start; c <= sel_col_end; ++c) { for (col_type c = sel_col_start; c <= sel_col_end; ++c)
bool const lineSet = (feature == Tabular::SET_LINE_LEFT)
? (value == "true") : !tabular.leftLine(tabular.cellIndex(r, c));
tabular.setLeftLine(tabular.cellIndex(r, c), lineSet); tabular.setLeftLine(tabular.cellIndex(r, c), lineSet);
}
break; break;
} }
case Tabular::SET_LINE_RIGHT: case Tabular::SET_LINE_RIGHT:
case Tabular::TOGGLE_LINE_RIGHT: { case Tabular::TOGGLE_LINE_RIGHT: {
bool lineSet = (feature == Tabular::SET_LINE_RIGHT)
? (value == "true") : !tabular.rightLine(cur.idx());
for (row_type r = sel_row_start; r <= sel_row_end; ++r) for (row_type r = sel_row_start; r <= sel_row_end; ++r)
for (col_type c = sel_col_start; c <= sel_col_end; ++c) { for (col_type c = sel_col_start; c <= sel_col_end; ++c)
bool const lineSet = (feature == Tabular::SET_LINE_RIGHT)
? (value == "true") : !tabular.rightLine(tabular.cellIndex(r, c));
tabular.setRightLine(tabular.cellIndex(r, c), lineSet); tabular.setRightLine(tabular.cellIndex(r, c), lineSet);
}
break; break;
} }