razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #1031 from manongjohn/fix_parent_column_indicators

Browse source 
Fix parent column indicators
This commit is contained in:
manongjohn 2022-11-26 02:17:06 -05:00 committed by GitHub
commit 1ec4d37721
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -2881,9 +2881,10 @@ void CellArea::drawPaletteCell(QPainter &p, int row, int col,
: m_viewer->getReferenceColumnColor();
sideColor = m_viewer->getReferenceColumnBorderColor();
} else {
cellColor = (isSelected) ? m_viewer->getSelectedPaletteColumnColor()
: m_viewer->getPaletteColumnColor();
sideColor = m_viewer->getPaletteColumnBorderColor();
int levelType;
m_viewer->getCellTypeAndColors(levelType, cellColor, sideColor, cell,
isSelected);
if (isImplicitCell) cellColor.setAlpha(m_viewer->getImplicitCellAlpha());
if (isStopFrame) {
cellColorAlpha = cellColor.alpha();

15
toonz/sources/toonz/xshcolumnviewer.cpp
View file

@ -481,11 +481,12 @@ void ChangeObjectParent::refresh() {
: viewer->getOtherCameraColor();
} else if (id.isColumn() && (!xsh->isColumnEmpty(index))) {
TXshColumn *colx = xsh->getColumn(index);
if (colx->getColumnType() != TXshColumn::eSoundTextType &&
colx->getColumnType() != TXshColumn::eSoundType) {
QColor unused;
if (colx->getColumnType() == TXshColumn::eSoundTextType ||
colx->getColumnType() == TXshColumn::eSoundType)
continue;
QColor unused;
viewer->getColumnColor(newTextBG, unused, id.getIndex(), xsh);
}
} else
continue;
@ -1269,8 +1270,7 @@ void ColumnArea::DrawHeader::drawPegbarName() const {
p.setPen(m_viewer->getVerticalLineColor());
if (o->flag(PredefinedFlag::PEGBAR_NAME_BORDER)) p.drawRect(pegbarnamerect);
if (column->getSoundColumn() || column->getSoundTextColumn() ||
column->getPaletteColumn())
if (column->getSoundColumn() || column->getSoundTextColumn())
return;
if (Preferences::instance()->isParentColorsInXsheetColumnEnabled() &&
@ -1305,8 +1305,7 @@ void ColumnArea::DrawHeader::drawPegbarName() const {
void ColumnArea::DrawHeader::drawParentHandleName() const {
if (col < 0 || isEmpty ||
!o->flag(PredefinedFlag::PARENT_HANDLE_NAME_VISIBILE) ||
column->getSoundColumn() || column->getSoundTextColumn() ||
column->getPaletteColumn())
column->getSoundColumn() || column->getSoundTextColumn())
return;
TStageObjectId columnId = m_viewer->getObjectId(col);

5
toonz/sources/toonz/xsheetviewer.cpp
View file

@ -116,6 +116,11 @@ void XsheetViewer::getCellTypeAndColors(int &ltype, QColor &cellColor,
(isSelected) ? getSelectedMeshColumnColor() : getMeshColumnColor();
sideColor = getMeshColumnBorderColor();
break;
case PLT_XSHLEVEL:
cellColor =
(isSelected) ? getSelectedPaletteColumnColor() : getPaletteColumnColor();
sideColor = getPaletteColumnBorderColor();
break;
case UNKNOWN_XSHLEVEL:
case NO_XSHLEVEL:
default: