OpenToonz - An open-source full-featured 2D animation creation software
C
adjustable passthrough text color
konero6bead43becd2
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qssindex 5f5cb3dcb..1ce0d787a 100644--- a/stuff/config/qss/Blue/Blue.qss+++ b/stuff/config/qss/Blue/Blue.qss@@ -1762,6 +1762,7 @@ ProjectPopup QLabel {----------------------------------------------------------------------------- */SchematicViewer {qproperty-TextColor: #d6d8dd;+ qproperty-PassThroughTextColor: #d6d8dd;qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);qproperty-LevelColumnColor: #4C6E4C;qproperty-VectorColumnColor: #7B7B4C;diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qssindex f89aced1c..d27c45b3f 100644--- a/stuff/config/qss/Dark/Dark.qss+++ b/stuff/config/qss/Dark/Dark.qss@@ -1762,6 +1762,7 @@ ProjectPopup QLabel {----------------------------------------------------------------------------- */SchematicViewer {qproperty-TextColor: #e6e6e6;+ qproperty-PassThroughTextColor: #e6e6e6;qproperty-VerticalLineColor: rgba(0, 0, 0, 0.4);qproperty-LevelColumnColor: #4C6E4C;qproperty-VectorColumnColor: #7B7B4C;diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qssindex d489ef6dc..437cb60d3 100644--- a/stuff/config/qss/Default/Default.qss+++ b/stuff/config/qss/Default/Default.qss@@ -1762,6 +1762,7 @@ ProjectPopup QLabel {----------------------------------------------------------------------------- */SchematicViewer {qproperty-TextColor: #e6e6e6;+ qproperty-PassThroughTextColor: #e6e6e6;qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);qproperty-LevelColumnColor: #4C6E4C;qproperty-VectorColumnColor: #7B7B4C;diff --git a/stuff/config/qss/Default/less/layouts/schematic.less b/stuff/config/qss/Default/less/layouts/schematic.lessindex 349e7c5fe..a377b2b86 100644--- a/stuff/config/qss/Default/less/layouts/schematic.less+++ b/stuff/config/qss/Default/less/layouts/schematic.less@@ -4,6 +4,7 @@SchematicViewer {qproperty-TextColor: @schematic-text-color;+ qproperty-PassThroughTextColor: @schematic-text-color;qproperty-VerticalLineColor: @schematic-VerticalLine-color;qproperty-LevelColumnColor: @xsheet-LevelColumn-color;diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qssindex fb56d0cbb..5386e8ae4 100644--- a/stuff/config/qss/Light/Light.qss+++ b/stuff/config/qss/Light/Light.qss@@ -1762,6 +1762,7 @@ ProjectPopup QLabel {----------------------------------------------------------------------------- */SchematicViewer {qproperty-TextColor: #000;+ qproperty-PassThroughTextColor: #000;qproperty-VerticalLineColor: rgba(0, 0, 0, 0.15);qproperty-LevelColumnColor: #a1cea1;qproperty-VectorColumnColor: #d3cf9a;diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qssindex 7a1a06c55..715cf6d05 100644--- a/stuff/config/qss/Neutral/Neutral.qss+++ b/stuff/config/qss/Neutral/Neutral.qss@@ -1762,6 +1762,7 @@ ProjectPopup QLabel {----------------------------------------------------------------------------- */SchematicViewer {qproperty-TextColor: #000;+ qproperty-PassThroughTextColor: #000;qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);qproperty-LevelColumnColor: #78a578;qproperty-VectorColumnColor: #a7a163;diff --git a/toonz/sources/include/toonzqt/schematicviewer.h b/toonz/sources/include/toonzqt/schematicviewer.hindex 6a37b764f..7ad1f1c4a 100644--- a/toonz/sources/include/toonzqt/schematicviewer.h+++ b/toonz/sources/include/toonzqt/schematicviewer.h@@ -212,6 +212,10 @@ class DVAPI SchematicViewer final : public QWidget {QColor m_textColor; // text color (black)Q_PROPERTY(QColor TextColor READ getTextColor WRITE setTextColor)+ QColor m_passThroughTextColor; // text outside of the node rect+ Q_PROPERTY(QColor PassThroughTextColor READ getPassThroughTextColor WRITE+ setPassThroughTextColor)+QColor m_verticalLineColor;Q_PROPERTY(QColor VerticalLineColor READ getVerticalLineColor WRITEsetVerticalLineColor)@@ -391,6 +395,11 @@ public:void setTextColor(const QColor &color) { m_textColor = color; }QColor getTextColor() const { return m_textColor; }+ void setPassThroughTextColor(const QColor &color) {+ m_passThroughTextColor = color;+ }+ QColor getPassThroughTextColor() const { return m_passThroughTextColor; }+void setVerticalLineColor(const QColor &color) {m_verticalLineColor = color;}diff --git a/toonz/sources/toonzqt/fxschematicnode.cpp b/toonz/sources/toonzqt/fxschematicnode.cppindex f757fc260..abfcb5c78 100644--- a/toonz/sources/toonzqt/fxschematicnode.cpp+++ b/toonz/sources/toonzqt/fxschematicnode.cpp@@ -3815,7 +3815,7 @@ void FxPassThroughPainter::paint(QPainter *painter,painter->setFont(fnt);}- painter->setPen(viewer->getTextColor());+ painter->setPen(viewer->getPassThroughTextColor());if (!m_parent->isNameEditing()) {// if this is a current object