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

Revert "Disable current column text highlight color"

Browse source 
This reverts commit 4709f2e484.
This commit is contained in:
manongjohn 2023-06-13 23:17:45 -04:00
parent fc207ebefc
commit a8a446a913
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/toonz/preferencespopup.cpp
View file

@ -2086,7 +2086,7 @@ QWidget* PreferencesPopup::createXsheetPage() {
insertUI(syncLevelRenumberWithXsheet, lay); insertUI(syncLevelRenumberWithXsheet, lay);
insertUI(currentTimelineEnabled, lay); insertUI(currentTimelineEnabled, lay);
} }
// insertUI(currentColumnColor, lay); insertUI(currentColumnColor, lay);
insertUI(currentCellColor, lay); insertUI(currentCellColor, lay);
if (Preferences::instance()->isShowAdvancedOptionsEnabled()) if (Preferences::instance()->isShowAdvancedOptionsEnabled())
insertUI(showFrameNumberWithLetters, lay); insertUI(showFrameNumberWithLetters, lay);

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

@ -1047,9 +1047,8 @@ void ColumnArea::DrawHeader::drawColumnNumber() const {
p.setPen(m_viewer->getVerticalLineColor()); p.setPen(m_viewer->getVerticalLineColor());
if (o->flag(PredefinedFlag::LAYER_NUMBER_BORDER)) p.drawRect(pos); if (o->flag(PredefinedFlag::LAYER_NUMBER_BORDER)) p.drawRect(pos);
// p.setPen((isCurrent) ? m_viewer->getSelectedColumnTextColor() p.setPen((isCurrent) ? m_viewer->getSelectedColumnTextColor()
// : m_viewer->getTextColor()); : m_viewer->getTextColor());
p.setPen(m_viewer->getTextColor());
int valign = o->isVerticalTimeline() ? Qt::AlignVCenter : Qt::AlignBottom; int valign = o->isVerticalTimeline() ? Qt::AlignVCenter : Qt::AlignBottom;
@ -1121,13 +1120,11 @@ void ColumnArea::DrawHeader::drawColumnName() const {
leftadj = 24; leftadj = 24;
} }
// p.setPen((isCurrent) ? m_viewer->getSelectedColumnTextColor() p.setPen((isCurrent) ? m_viewer->getSelectedColumnTextColor()
// : nameBacklit ? Qt::black : m_viewer->getTextColor()); : nameBacklit ? Qt::black : m_viewer->getTextColor());
p.setPen(nameBacklit ? Qt::black : m_viewer->getTextColor());
} else } else
// p.setPen((isCurrent) ? m_viewer->getSelectedColumnTextColor() p.setPen((isCurrent) ? m_viewer->getSelectedColumnTextColor()
// : m_viewer->getTextColor()); : m_viewer->getTextColor());
p.setPen(m_viewer->getTextColor());
if (o->isVerticalTimeline() && col < 0) { if (o->isVerticalTimeline() && col < 0) {
QString cameraName = QString::fromStdString(name); QString cameraName = QString::fromStdString(name);