OpenToonz - An open-source full-featured 2D animation creation software
C
Add Table Color Preference option and CSS override
Rodneyec9dced3626e
diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.hindex 2036cbc83..aad29fa4c 100644--- a/toonz/sources/include/toonz/preferences.h+++ b/toonz/sources/include/toonz/preferences.h@@ -531,6 +531,7 @@ public:// Colors tabTPixel getViewerBgColor() const { return getColorValue(viewerBGColor); }+ TPixel getTableColor() const { return getColorValue(tableColor); }TPixel getPreviewBgColor() const { return getColorValue(previewBGColor); }TPixel getLevelEditorBoxColor() const {return getColorValue(levelEditorBoxColor);diff --git a/toonz/sources/include/toonz/preferencesitemids.h b/toonz/sources/include/toonz/preferencesitemids.hindex 2503bc66a..75c056b90 100644--- a/toonz/sources/include/toonz/preferencesitemids.h+++ b/toonz/sources/include/toonz/preferencesitemids.h@@ -199,6 +199,7 @@ enum PreferencesItemId {//----------// ColorsviewerBGColor,+ tableColor,previewBGColor,levelEditorBoxColor,chessboardColor1,diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cppindex cd33a8475..2101eaaef 100644--- a/toonz/sources/toonz/preferencespopup.cpp+++ b/toonz/sources/toonz/preferencespopup.cpp@@ -1489,6 +1489,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {// Colors{viewerBGColor, tr("Viewer BG Color:")},+ {tableColor, tr("Table Color:")},{previewBGColor, tr("Preview BG Color:")},{levelEditorBoxColor, tr("Level Editor Box Color:")},{chessboardColor1, tr("Chessboard Color 1:")},@@ -2563,6 +2564,7 @@ QWidget* PreferencesPopup::createColorsPage() {setupLayout(lay);insertUI(viewerBGColor, lay);+ insertUI(tableColor, lay);insertUI(previewBGColor, lay);insertUI(levelEditorBoxColor, lay);insertUI(chessboardColor1, lay);@@ -2586,6 +2588,7 @@ QWidget* PreferencesPopup::createColorsPage() {m_onEditedFuncMap.insert(viewerBGColor,&PreferencesPopup::notifySceneChanged);+ m_onEditedFuncMap.insert(tableColor, &PreferencesPopup::notifySceneChanged);m_onEditedFuncMap.insert(previewBGColor,&PreferencesPopup::notifySceneChanged);m_onEditedFuncMap.insert(levelEditorBoxColor,diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cppindex 6ca670239..375c16292 100644--- a/toonz/sources/toonz/sceneviewer.cpp+++ b/toonz/sources/toonz/sceneviewer.cpp@@ -83,11 +83,13 @@// Qt includes#include <QMenu>#include <QApplication>+#include <QEvent>#include <QScreen>#include <QInputMethod>#include <QGLContext>#include <QOpenGLFramebufferObject>#include <QMainWindow>+#include <QStyle>#include "sceneviewer.h"@@ -1089,6 +1091,34 @@ TPointD SceneViewer::worldToPos(const TPointD &worldPos) const {//-----------------------------------------------------------------------------+QColor SceneViewer::getTableColor() const {+ if (m_tableColorOverride.isValid()) return m_tableColorOverride;+ const TPixel32 color = Preferences::instance()->getTableColor();+ return QColor(color.r, color.g, color.b);+}++//-----------------------------------------------------------------------------++void SceneViewer::setTableColor(const QColor &color) {+ if (m_tableColorOverride == color) return;+ m_tableColorOverride = color;+ GLInvalidateAll();+}++//-----------------------------------------------------------------------------++void SceneViewer::changeEvent(QEvent *event) {+ TToolViewer::changeEvent(event);+ if (event->type() != QEvent::StyleChange) return;++ // Qt does not reset qproperty values when a stylesheet rule is removed.+ m_tableColorOverride = QColor();+ if (testAttribute(Qt::WA_WState_Polished)) style()->polish(this);+ GLInvalidateAll();+}++//-----------------------------------------------------------------------------+void SceneViewer::showEvent(QShowEvent *) {m_visualSettings.m_sceneProperties =TApp::instance()->getCurrentScene()->getScene()->getProperties();@@ -1539,7 +1569,7 @@ void SceneViewer::drawCameraStand() {!m_drawCameraTest) {glPushMatrix();tglMultMatrix(m_drawTableAff);- ViewerDraw::drawDisk(m_tableDLId);+ ViewerDraw::drawDisk(m_tableDLId, getTableColor());glPopMatrix();}diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.hindex a9f3ba8dc..9e2441d1f 100644--- a/toonz/sources/toonz/sceneviewer.h+++ b/toonz/sources/toonz/sceneviewer.h@@ -22,6 +22,7 @@#include "previewer.h"#include <array>+#include <QColor>#include <QMatrix4x4>#include <QTouchDevice>@@ -64,6 +65,7 @@ public:class SceneViewer final : public TToolViewer, public Previewer::Listener {Q_OBJECT+ Q_PROPERTY(QColor TableColor READ getTableColor WRITE setTableColor)double m_pressure;QPointF m_lastMousePos;@@ -139,6 +141,7 @@ class SceneViewer final : public TToolViewer, public Previewer::Listener {TPointD m_dpiScale;int m_tableDLId; // To compute table DisplayList only if necessary.+ QColor m_tableColorOverride;int m_groupIndexToBeEntered;@@ -214,6 +217,9 @@ public:double getPixelSize() const override { return m_pixelSize; }+ QColor getTableColor() const;+ void setTableColor(const QColor &color);+// Previewer::ListenerTRectD getPreviewRect() const override;void onRenderStarted(int frame) override;@@ -348,6 +354,7 @@ protected:void paintGL() override;+ void changeEvent(QEvent *event) override;void showEvent(QShowEvent *) override;void hideEvent(QHideEvent *) override;diff --git a/toonz/sources/toonz/viewerdraw.cpp b/toonz/sources/toonz/viewerdraw.cppindex 9b9704789..827006831 100644--- a/toonz/sources/toonz/viewerdraw.cpp+++ b/toonz/sources/toonz/viewerdraw.cpp@@ -33,6 +33,7 @@#include "subcameramanager.h"+#include <QColor>#include <QSettings>TEnv::StringVar EnvSafeAreaName("SafeAreaName", "PR_safe");@@ -736,7 +737,7 @@ void ViewerDraw::drawFieldGuide() {//------------------------------------------------------------------------------void ViewerDraw::drawDisk(int &tableDLId) {+void ViewerDraw::drawDisk(int &tableDLId, const QColor &tableColor) {static TPixel32 currentBgColor;TPixel32 bgColor;@@ -750,6 +751,7 @@ void ViewerDraw::drawDisk(int &tableDLId) {currentBgColor = bgColor;tableDLId = createDiskDisplayList();}+ glColor3ub(tableColor.red(), tableColor.green(), tableColor.blue());glCallList(tableDLId);}@@ -770,7 +772,6 @@ unsigned int ViewerDraw::createDiskDisplayList() {}double r = 10 * Stage::inch;glNewList(id, GL_COMPILE);- glColor3d(.6, .65, .7);glBegin(GL_POLYGON);int i;int n = 120;diff --git a/toonz/sources/toonz/viewerdraw.h b/toonz/sources/toonz/viewerdraw.hindex 965e4e0f5..fcc11bd55 100644--- a/toonz/sources/toonz/viewerdraw.h+++ b/toonz/sources/toonz/viewerdraw.h@@ -15,6 +15,7 @@class SceneViewer;class Ruler;class TAffine;+class QColor;//=============================================================================// ViewerDraw@@ -40,7 +41,7 @@ void draw3DCamera(unsigned long flags, double zmin, double phi);void drawCamera(unsigned long flags, double pixelSize);void draw3DFrame(double zmin, double phi);-void drawDisk(int &tableDLId);+void drawDisk(int &tableDLId, const QColor &tableColor);void drawFieldGuide();void drawColorcard(UCHAR channel);diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cppindex dffa4b927..669cbd003 100644--- a/toonz/sources/toonzlib/preferences.cpp+++ b/toonz/sources/toonzlib/preferences.cpp@@ -688,6 +688,7 @@ void Preferences::definePreferenceItems() {// Colorsdefine(viewerBGColor, "viewerBGColor", QMetaType::QColor,QColor(128, 128, 128));+ define(tableColor, "tableColor", QMetaType::QColor, QColor(153, 166, 179));define(previewBGColor, "previewBGColor", QMetaType::QColor,QColor(64, 64, 64));define(levelEditorBoxColor, "levelEditorBoxColor", QMetaType::QColor,