diff --git a/toonz/sources/toonz/Resources/x_lock.png b/toonz/sources/toonz/Resources/x_lock.png index 2fc7625..60a0fdb 100644 Binary files a/toonz/sources/toonz/Resources/x_lock.png and b/toonz/sources/toonz/Resources/x_lock.png differ diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp index b771c3f..66940ef 100644 --- a/toonz/sources/toonz/xshcellviewer.cpp +++ b/toonz/sources/toonz/xshcellviewer.cpp @@ -973,7 +973,9 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference) int y = m_viewer->rowToY(row); QRect rect = QRect(x + 1, y + 1, ColumnWidth - 1, RowHeight - 1); if (cell.isEmpty()) { // vuol dire che la precedente non e' vuota - p.setPen(XsheetGUI::LevelEndCrossColor); + QColor levelEndColor = m_viewer->getTextColor(); + levelEndColor.setAlphaF(0.3); + p.setPen(levelEndColor); p.drawLine(rect.topLeft(), rect.bottomRight()); p.drawLine(rect.topRight(), rect.bottomLeft()); return; @@ -1010,7 +1012,7 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference) //draw dot line if the column is locked TXshColumn *column = xsh->getColumn(col); if (column->isLocked()) { - p.setPen(QPen(Qt::gray, 2, Qt::DotLine)); + p.setPen(QPen(cellColor, 2, Qt::DotLine)); p.drawLine(x + 3, y, x + 3, y + RowHeight); } // draw "end of the level" @@ -1185,7 +1187,9 @@ void CellArea::drawPaletteCell(QPainter &p, int row, int col, bool isReference) int y = m_viewer->rowToY(row); QRect rect = QRect(x + 1, y + 1, ColumnWidth - 1, RowHeight - 1); if (cell.isEmpty()) { // vuol dire che la precedente non e' vuota - p.setPen(XsheetGUI::LevelEndCrossColor); + QColor levelEndColor = m_viewer->getTextColor(); + levelEndColor.setAlphaF(0.3); + p.setPen(levelEndColor); p.drawLine(rect.topLeft(), rect.bottomRight()); p.drawLine(rect.topRight(), rect.bottomLeft()); return; @@ -1205,7 +1209,7 @@ void CellArea::drawPaletteCell(QPainter &p, int row, int col, bool isReference) TXshColumn *column = xsh->getColumn(col); if (column->isLocked()) { - p.setPen(QPen(Qt::gray, 2, Qt::DotLine)); + p.setPen(QPen(cellColor, 2, Qt::DotLine)); p.drawLine(x + 3, y, x + 3, y + RowHeight); } diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.h index 464826a..5d24bd9 100644 --- a/toonz/sources/toonz/xsheetviewer.h +++ b/toonz/sources/toonz/xsheetviewer.h @@ -110,8 +110,6 @@ const QColor XsheetBGColor(212, 208, 200); //Xsheet horizontal lines const QColor NormalHLineColor(146, 144, 146); const QColor IntervalHLineColor(0, 255, 246); -//"X" mark at the end of the level -const QColor LevelEndCrossColor(50, 50, 50); //column header const QColor EmptyColumnHeadColor(200, 200, 200);