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

Color lines of added/deleted rows/columns

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-01-13 19:02:48 +01:00
parent cbabff4686
commit 194298045c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/insets/InsetTabular.cpp
View File

@ -4486,9 +4486,9 @@ void InsetTabular::drawSelection(PainterInfo & pi, int x, int y) const
namespace { namespace {
void tabline(PainterInfo const & pi, int x1, int y1, int x2, int y2, int lt, int rt, void tabline(PainterInfo const & pi, int x1, int y1, int x2, int y2, int lt, int rt,
bool drawline, bool heavy = false) Color const incol, bool drawline, bool heavy = false)
{ {
ColorCode const col = drawline ? Color_tabularline : Color_tabularonoffline; Color const col = drawline ? incol : Color_tabularonoffline;
if (drawline && lt > 0) if (drawline && lt > 0)
pi.pain.line(x1, y1, x1 + lt, y2, pi.textColor(Color_tabularonoffline), pi.pain.line(x1, y1, x1 + lt, y2, pi.textColor(Color_tabularonoffline),
Painter::line_onoffdash, Painter::line_onoffdash,
@ -4516,6 +4516,12 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
col_type const col = tabular.cellColumn(cell); col_type const col = tabular.cellColumn(cell);
// Colour the frame if rows/columns are added or deleted
Color colour = Color_tabularline;
if (tabular.column_info[col].change != Change::UNCHANGED
|| tabular.row_info[row].change != Change::UNCHANGED)
colour = InsetTableCell(*tabular.cellInset(cell)).paragraphs().front().lookupChange(0).color();
// Top // Top
bool drawline = tabular.topLine(cell) bool drawline = tabular.topLine(cell)
|| (row > 0 && tabular.bottomLine(tabular.cellAbove(cell))); || (row > 0 && tabular.bottomLine(tabular.cellAbove(cell)));
@ -4528,7 +4534,7 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
if (tabular.topLineTrim(cell).second if (tabular.topLineTrim(cell).second
|| (row > 0 && tabular.bottomLineTrim(tabular.cellIndex(row - 1, col)).second)) || (row > 0 && tabular.bottomLineTrim(tabular.cellIndex(row - 1, col)).second))
rt = 10; rt = 10;
tabline(pi, x, y, x + w, y, lt, rt, drawline, heavy); tabline(pi, x, y, x + w, y, lt, rt, colour, drawline, heavy);
// Bottom // Bottom
lt = rt = 0; lt = rt = 0;
@ -4546,12 +4552,12 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
lt = 10; lt = 10;
if (tabular.bottomLineTrim(cell).second) if (tabular.bottomLineTrim(cell).second)
rt = 10; rt = 10;
tabline(pi, x, y + h, x + w, y + h, lt, rt, drawline, heavy); tabline(pi, x, y + h, x + w, y + h, lt, rt, colour, drawline, heavy);
// Left // Left
drawline = tabular.leftLine(cell) drawline = tabular.leftLine(cell)
|| (col > 0 && tabular.rightLine(tabular.cellIndex(row, col - 1))); || (col > 0 && tabular.rightLine(tabular.cellIndex(row, col - 1)));
tabline(pi, x, y, x, y + h, 0, 0, drawline); tabline(pi, x, y, x, y + h, 0, 0, colour, drawline);
// Right // Right
x -= tabular.interColumnSpace(cell); x -= tabular.interColumnSpace(cell);
@ -4562,7 +4568,7 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
drawline = tabular.rightLine(cell) drawline = tabular.rightLine(cell)
|| (next_cell_col < tabular.ncols() || (next_cell_col < tabular.ncols()
&& tabular.leftLine(tabular.cellIndex(row, next_cell_col))); && tabular.leftLine(tabular.cellIndex(row, next_cell_col)));
tabline(pi, x + w, y, x + w, y + h, 0, 0, drawline); tabline(pi, x + w, y, x + w, y + h, 0, 0, colour, drawline);
} }