Merge pull request #1031 from manongjohn/fix_parent_column_indicators
Fix parent column indicators
This commit is contained in:
commit
1ec4d37721
3 changed files with 16 additions and 11 deletions
|
@ -2881,9 +2881,10 @@ void CellArea::drawPaletteCell(QPainter &p, int row, int col,
|
||||||
: m_viewer->getReferenceColumnColor();
|
: m_viewer->getReferenceColumnColor();
|
||||||
sideColor = m_viewer->getReferenceColumnBorderColor();
|
sideColor = m_viewer->getReferenceColumnBorderColor();
|
||||||
} else {
|
} else {
|
||||||
cellColor = (isSelected) ? m_viewer->getSelectedPaletteColumnColor()
|
int levelType;
|
||||||
: m_viewer->getPaletteColumnColor();
|
m_viewer->getCellTypeAndColors(levelType, cellColor, sideColor, cell,
|
||||||
sideColor = m_viewer->getPaletteColumnBorderColor();
|
isSelected);
|
||||||
|
|
||||||
if (isImplicitCell) cellColor.setAlpha(m_viewer->getImplicitCellAlpha());
|
if (isImplicitCell) cellColor.setAlpha(m_viewer->getImplicitCellAlpha());
|
||||||
if (isStopFrame) {
|
if (isStopFrame) {
|
||||||
cellColorAlpha = cellColor.alpha();
|
cellColorAlpha = cellColor.alpha();
|
||||||
|
|
|
@ -481,11 +481,12 @@ void ChangeObjectParent::refresh() {
|
||||||
: viewer->getOtherCameraColor();
|
: viewer->getOtherCameraColor();
|
||||||
} else if (id.isColumn() && (!xsh->isColumnEmpty(index))) {
|
} else if (id.isColumn() && (!xsh->isColumnEmpty(index))) {
|
||||||
TXshColumn *colx = xsh->getColumn(index);
|
TXshColumn *colx = xsh->getColumn(index);
|
||||||
if (colx->getColumnType() != TXshColumn::eSoundTextType &&
|
if (colx->getColumnType() == TXshColumn::eSoundTextType ||
|
||||||
colx->getColumnType() != TXshColumn::eSoundType) {
|
colx->getColumnType() == TXshColumn::eSoundType)
|
||||||
QColor unused;
|
continue;
|
||||||
|
|
||||||
|
QColor unused;
|
||||||
viewer->getColumnColor(newTextBG, unused, id.getIndex(), xsh);
|
viewer->getColumnColor(newTextBG, unused, id.getIndex(), xsh);
|
||||||
}
|
|
||||||
} else
|
} else
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -1269,8 +1270,7 @@ void ColumnArea::DrawHeader::drawPegbarName() const {
|
||||||
p.setPen(m_viewer->getVerticalLineColor());
|
p.setPen(m_viewer->getVerticalLineColor());
|
||||||
if (o->flag(PredefinedFlag::PEGBAR_NAME_BORDER)) p.drawRect(pegbarnamerect);
|
if (o->flag(PredefinedFlag::PEGBAR_NAME_BORDER)) p.drawRect(pegbarnamerect);
|
||||||
|
|
||||||
if (column->getSoundColumn() || column->getSoundTextColumn() ||
|
if (column->getSoundColumn() || column->getSoundTextColumn())
|
||||||
column->getPaletteColumn())
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (Preferences::instance()->isParentColorsInXsheetColumnEnabled() &&
|
if (Preferences::instance()->isParentColorsInXsheetColumnEnabled() &&
|
||||||
|
@ -1305,8 +1305,7 @@ void ColumnArea::DrawHeader::drawPegbarName() const {
|
||||||
void ColumnArea::DrawHeader::drawParentHandleName() const {
|
void ColumnArea::DrawHeader::drawParentHandleName() const {
|
||||||
if (col < 0 || isEmpty ||
|
if (col < 0 || isEmpty ||
|
||||||
!o->flag(PredefinedFlag::PARENT_HANDLE_NAME_VISIBILE) ||
|
!o->flag(PredefinedFlag::PARENT_HANDLE_NAME_VISIBILE) ||
|
||||||
column->getSoundColumn() || column->getSoundTextColumn() ||
|
column->getSoundColumn() || column->getSoundTextColumn())
|
||||||
column->getPaletteColumn())
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
TStageObjectId columnId = m_viewer->getObjectId(col);
|
TStageObjectId columnId = m_viewer->getObjectId(col);
|
||||||
|
|
|
@ -116,6 +116,11 @@ void XsheetViewer::getCellTypeAndColors(int <ype, QColor &cellColor,
|
||||||
(isSelected) ? getSelectedMeshColumnColor() : getMeshColumnColor();
|
(isSelected) ? getSelectedMeshColumnColor() : getMeshColumnColor();
|
||||||
sideColor = getMeshColumnBorderColor();
|
sideColor = getMeshColumnBorderColor();
|
||||||
break;
|
break;
|
||||||
|
case PLT_XSHLEVEL:
|
||||||
|
cellColor =
|
||||||
|
(isSelected) ? getSelectedPaletteColumnColor() : getPaletteColumnColor();
|
||||||
|
sideColor = getPaletteColumnBorderColor();
|
||||||
|
break;
|
||||||
case UNKNOWN_XSHLEVEL:
|
case UNKNOWN_XSHLEVEL:
|
||||||
case NO_XSHLEVEL:
|
case NO_XSHLEVEL:
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in a new issue