OpenToonz - An open-source full-featured 2D animation creation software
C
Make MyScroller Configurable in Stylesheet
konero6be91a5a8efe
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qssindex c39a65981..3e755265d 100644--- a/stuff/config/qss/Blue/Blue.qss+++ b/stuff/config/qss/Blue/Blue.qss@@ -1300,6 +1300,13 @@ QProgressBar::chunk {border: 1 solid #262728;border-radius: 2;}+/* -----------------------------------------------------------------------------+ Custom Panel Widgets+----------------------------------------------------------------------------- */+MyScroller {+ qproperty-ScrollerBorderColor: #747b8c;+ qproperty-ScrollerBGColor: #2d2f30;+}/* -----------------------------------------------------------------------------File Browser----------------------------------------------------------------------------- */@@ -2289,9 +2296,9 @@ Ruler {XsheetViewer {qproperty-TextColor: #d6d8dd;qproperty-ErrorTextColor: #ff7b7b;- qproperty-BGColor: #3a3b3d;qproperty-SelectedTextColor: #d6d8dd;qproperty-CurrentFrameTextColor: #d6d8dd;+ qproperty-BGColor: #3a3b3d;qproperty-LightLineColor: rgba(0, 0, 0, 0.2);qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.25);diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qssindex f433cc420..a995fed66 100644--- a/stuff/config/qss/Dark/Dark.qss+++ b/stuff/config/qss/Dark/Dark.qss@@ -1300,6 +1300,13 @@ QProgressBar::chunk {border: 1 solid #111111;border-radius: 2;}+/* -----------------------------------------------------------------------------+ Custom Panel Widgets+----------------------------------------------------------------------------- */+MyScroller {+ qproperty-ScrollerBorderColor: #8d8d8d;+ qproperty-ScrollerBGColor: #1c1c1c;+}/* -----------------------------------------------------------------------------File Browser----------------------------------------------------------------------------- */@@ -2289,9 +2296,9 @@ Ruler {XsheetViewer {qproperty-TextColor: #e6e6e6;qproperty-ErrorTextColor: #ff7b7b;- qproperty-BGColor: #303030;qproperty-SelectedTextColor: #e6e6e6;qproperty-CurrentFrameTextColor: #e6e6e6;+ qproperty-BGColor: #303030;qproperty-LightLineColor: rgba(0, 0, 0, 0.3);qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.25);diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qssindex f39d1276f..b1600d9b2 100644--- a/stuff/config/qss/Default/Default.qss+++ b/stuff/config/qss/Default/Default.qss@@ -1300,6 +1300,13 @@ QProgressBar::chunk {border: 1 solid #2c2c2c;border-radius: 2;}+/* -----------------------------------------------------------------------------+ Custom Panel Widgets+----------------------------------------------------------------------------- */+MyScroller {+ qproperty-ScrollerBorderColor: #8d8d8d;+ qproperty-ScrollerBGColor: #343434;+}/* -----------------------------------------------------------------------------File Browser----------------------------------------------------------------------------- */@@ -2289,9 +2296,9 @@ Ruler {XsheetViewer {qproperty-TextColor: #e6e6e6;qproperty-ErrorTextColor: #ff7b7b;- qproperty-BGColor: #404040;qproperty-SelectedTextColor: #e6e6e6;qproperty-CurrentFrameTextColor: #e6e6e6;+ qproperty-BGColor: #404040;qproperty-LightLineColor: rgba(0, 0, 0, 0.2);qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.25);diff --git a/stuff/config/qss/Default/less/Default.less b/stuff/config/qss/Default/less/Default.lessindex 19c806801..d2393cdb4 100644--- a/stuff/config/qss/Default/less/Default.less+++ b/stuff/config/qss/Default/less/Default.less@@ -303,6 +303,13 @@@slider-left-handle-disabled: @slider-handle-img-disabled;@slider-right-handle-disabled: @slider-handle-img-disabled;+// -----------------------------------------------------------------------------+// Custom Panel Widgets+// -----------------------------------------------------------------------------++@customPanel-Scroller-border-color: darken(@text-color, 35);+@customPanel-Scroller-bg-color: darken(@bg, 8);+// -----------------------------------------------------------------------------// Titlebars// -----------------------------------------------------------------------------diff --git a/stuff/config/qss/Default/less/layouts/controls.less b/stuff/config/qss/Default/less/layouts/controls.lessindex 037aaac55..8c9773b8c 100644--- a/stuff/config/qss/Default/less/layouts/controls.less+++ b/stuff/config/qss/Default/less/layouts/controls.less@@ -393,3 +393,12 @@ QProgressBar {border-radius: 2;}}++/* -----------------------------------------------------------------------------+ Custom Panel Widgets+----------------------------------------------------------------------------- */++MyScroller {+ qproperty-ScrollerBorderColor: @customPanel-Scroller-border-color;+ qproperty-ScrollerBGColor: @customPanel-Scroller-bg-color;+}diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qssindex d59ded0cf..ac23e2020 100644--- a/stuff/config/qss/Light/Light.qss+++ b/stuff/config/qss/Light/Light.qss@@ -1300,6 +1300,13 @@ QProgressBar::chunk {border: 1 solid #a8a8a8;border-radius: 2;}+/* -----------------------------------------------------------------------------+ Custom Panel Widgets+----------------------------------------------------------------------------- */+MyScroller {+ qproperty-ScrollerBorderColor: #000000;+ qproperty-ScrollerBGColor: #c7c7c7;+}/* -----------------------------------------------------------------------------File Browser----------------------------------------------------------------------------- */@@ -2289,9 +2296,9 @@ Ruler {XsheetViewer {qproperty-TextColor: #000;qproperty-ErrorTextColor: #c01111;- qproperty-BGColor: #cecece;qproperty-SelectedTextColor: #000;qproperty-CurrentFrameTextColor: #000;+ qproperty-BGColor: #cecece;qproperty-LightLineColor: rgba(0, 0, 0, 0.15);qproperty-MarkerLineColor: rgba(0, 0, 0, 0.3);qproperty-SecMarkerLineColor: rgba(0, 0, 0, 0.5);diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qssindex d5e01c232..250127dcc 100644--- a/stuff/config/qss/Neutral/Neutral.qss+++ b/stuff/config/qss/Neutral/Neutral.qss@@ -1300,6 +1300,13 @@ QProgressBar::chunk {border: 1 solid #5a5a5a;border-radius: 2;}+/* -----------------------------------------------------------------------------+ Custom Panel Widgets+----------------------------------------------------------------------------- */+MyScroller {+ qproperty-ScrollerBorderColor: #000000;+ qproperty-ScrollerBGColor: #6c6c6c;+}/* -----------------------------------------------------------------------------File Browser----------------------------------------------------------------------------- */@@ -2289,9 +2296,9 @@ Ruler {XsheetViewer {qproperty-TextColor: #000;qproperty-ErrorTextColor: #c01111;- qproperty-BGColor: #767676;qproperty-SelectedTextColor: #000;qproperty-CurrentFrameTextColor: #000;+ qproperty-BGColor: #767676;qproperty-LightLineColor: rgba(0, 0, 0, 0.15);qproperty-MarkerLineColor: rgba(255, 255, 255, 0.2);qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.35);diff --git a/toonz/sources/toonz/custompanelmanager.cpp b/toonz/sources/toonz/custompanelmanager.cppindex 61d7ad15f..669bbaf61 100644--- a/toonz/sources/toonz/custompanelmanager.cpp+++ b/toonz/sources/toonz/custompanelmanager.cpp@@ -36,8 +36,8 @@ MyScroller::MyScroller(Qt::Orientation orientation, CommandId command1,void MyScroller::paintEvent(QPaintEvent*) {QPainter p(this);- p.setPen(Qt::white);- p.setBrush(Qt::NoBrush);+ p.setPen(m_scrollerBorderColor);+ p.setBrush(m_scrollerBGColor);p.drawRect(rect().adjusted(0, 0, -1, -1));diff --git a/toonz/sources/toonz/custompanelmanager.h b/toonz/sources/toonz/custompanelmanager.hindex 006afa2b0..7b27ccda5 100644--- a/toonz/sources/toonz/custompanelmanager.h+++ b/toonz/sources/toonz/custompanelmanager.h@@ -17,11 +17,25 @@ class MyScroller : public QWidget {Qt::Orientation m_orientation;QAction* m_actions[2];int m_anchorPos;+ QColor m_scrollerBorderColor;+ QColor m_scrollerBGColor;++ Q_PROPERTY(QColor ScrollerBorderColor READ getScrollerBorderColor WRITE+ setScrollerBorderColor);+ Q_PROPERTY(QColor ScrollerBGColor READ getScrollerBGColor WRITE+ setScrollerBGColor);public:MyScroller(Qt::Orientation orientation, CommandId command1,CommandId command2, QWidget* parent = nullptr);+ void setScrollerBorderColor(const QColor& color) {+ m_scrollerBorderColor = color;+ }+ QColor getScrollerBorderColor() const { return m_scrollerBorderColor; }+ void setScrollerBGColor(const QColor& color) { m_scrollerBGColor = color; }+ QColor getScrollerBGColor() const { return m_scrollerBGColor; }+protected:void paintEvent(QPaintEvent*) override;void mousePressEvent(QMouseEvent* event) override;