Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

end-level-color

konero2b7689edb72b
diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp
index 3cfffab67..437de250e 100644
--- a/toonz/sources/toonz/xshcellviewer.cpp
+++ b/toonz/sources/toonz/xshcellviewer.cpp
@@ -1967,7 +1967,7 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference,
p.drawEllipse(markRect);
}
- QColor levelEndColor = m_viewer->getTextColor();
+ QColor levelEndColor = m_viewer->getLevelEndColor();
levelEndColor.setAlphaF(0.3);
p.setPen(levelEndColor);
p.drawLine(rect.topLeft(), rect.bottomRight());
@@ -2250,7 +2250,7 @@ void CellArea::drawSoundTextCell(QPainter &p, int row, int col) {
drawFrameSeparator(p, row, col, false, heldFrame);
- QColor levelEndColor = m_viewer->getTextColor();
+ QColor levelEndColor = m_viewer->getLevelEndColor();
levelEndColor.setAlphaF(0.3);
p.setPen(levelEndColor);
p.drawLine(rect.topLeft(), rect.bottomRight());
@@ -2455,7 +2455,7 @@ void CellArea::drawSoundTextColumn(QPainter &p, int r0, int r1, int col) {
TXshCell prevCell;
if (row > 0) prevCell = xsh->getCell(row - 1, col);
if (!prevCell.isEmpty()) {
- QColor levelEndColor = m_viewer->getTextColor();
+ QColor levelEndColor = m_viewer->getLevelEndColor();
levelEndColor.setAlphaF(0.3);
p.setPen(levelEndColor);
p.drawLine(info.rect.topLeft(), info.rect.bottomRight());
@@ -2710,7 +2710,7 @@ void CellArea::drawPaletteCell(QPainter &p, int row, int col,
drawFrameSeparator(p, row, col, false, heldFrame);
- QColor levelEndColor = m_viewer->getTextColor();
+ QColor levelEndColor = m_viewer->getLevelEndColor();
levelEndColor.setAlphaF(0.3);
p.setPen(levelEndColor);
p.drawLine(rect.topLeft(), rect.bottomRight());
diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.h
index 14d40ec3e..6f9159d9a 100644
--- a/toonz/sources/toonz/xsheetviewer.h
+++ b/toonz/sources/toonz/xsheetviewer.h
@@ -277,12 +277,14 @@ class XsheetViewer final : public QFrame, public SaveLoadQSettings {
QColor m_emptyCellColor; // empty cell (124,124,124)
QColor m_notEmptyColumnColor; // occupied column (164,164,164)
QColor m_selectedEmptyCellColor; // selected empty cell (210,210,210)
+ QColor m_levelEndColor; // end level cross
Q_PROPERTY(
QColor EmptyCellColor READ getEmptyCellColor WRITE setEmptyCellColor)
Q_PROPERTY(QColor NotEmptyColumnColor READ getNotEmptyColumnColor WRITE
setNotEmptyColumnColor)
Q_PROPERTY(QColor SelectedEmptyCellColor READ getSelectedEmptyCellColor WRITE
setSelectedEmptyCellColor)
+ Q_PROPERTY(QColor LevelEndColor READ getLevelEndColor WRITE setLevelEndColor)
// Cell focus
QColor m_cellFocusColor;
@@ -906,6 +908,8 @@ public:
m_selectedEmptyCellColor = color;
}
QColor getSelectedEmptyCellColor() const { return m_selectedEmptyCellColor; }
+ void setLevelEndColor(const QColor &color) { m_levelEndColor = color; }
+ QColor getLevelEndColor() const { return m_levelEndColor; }
// Cell focus
void setCellFocusColor(const QColor &color) { m_cellFocusColor = color; }