Timeline scrollbar: UI minor

friction2d · Aug 2, 2024 · b12f310 · b12f310
1 parent 945df56
commit b12f310
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/src/core/themesupport.cpp b/src/core/themesupport.cpp
@@ -145,6 +145,11 @@ const QColor ThemeSupport::getThemeColorGreen(int alpha)
     return getQColor(73, 209, 132, alpha);
 }
 
+const QColor ThemeSupport::getThemeColorGreenDark(int alpha)
+{
+    return getQColor(27, 49, 39, alpha);
+}
+
 const QColor ThemeSupport::getThemeColorOrange(int alpha)
 {
     return getQColor(255, 123, 0, alpha);

diff --git a/src/core/themesupport.h b/src/core/themesupport.h
@@ -57,6 +57,7 @@ class CORE_EXPORT ThemeSupport
     static const QColor getThemeColorYellow(int alpha = 255);
     static const QColor getThemeColorPink(int alpha = 255);
     static const QColor getThemeColorGreen(int alpha = 255);
+    static const QColor getThemeColorGreenDark(int alpha = 255);
     static const QColor getThemeColorOrange(int alpha = 255);
     static const QPalette getDarkPalette(int alpha = 255);
     static const QPalette getDarkerPalette(int alpha = 255);

diff --git a/src/ui/widgets/framescrollbar.cpp b/src/ui/widgets/framescrollbar.cpp
@@ -142,6 +142,18 @@ void FrameScrollBar::paintEvent(QPaintEvent *) {
         mMinFrame = mMinFrame - mMinFrame%iInc - 1;
         mMaxFrame += qFloor((width() - 40 - xT)/pixPerFrame) - mMaxFrame%iInc;
 
+        // draw in/out range
+        if (frameIn.first && frameOut.first) {
+            p.setPen(Qt::NoPen);
+            const qreal xTT1 = xT + (frameIn.second - mFrameRange.fMin) * pixPerFrame;
+            const qreal xTT2 = xT + (frameOut.second - mFrameRange.fMin) * pixPerFrame;
+            const int h = mFm.height();
+            const auto rect = QRectF(xTT1, h, xTT2 - xTT1, height() - h);
+            p.fillRect(rect, QBrush(ThemeSupport::getThemeColorGreenDark(),
+                                    Qt::SolidPattern));
+            p.drawRect(rect);
+        }
+
         // draw markers (and in/out)
         for (int i = minFrame; i <= maxFrame; i++) {
             bool hasIn = frameIn.first ? hasFrameIn(i) : false;
@@ -152,8 +164,9 @@ void FrameScrollBar::paintEvent(QPaintEvent *) {
             p.setPen(QPen(col, 2, Qt::SolidLine));
             const qreal xTT = xT + (i - mFrameRange.fMin + 1)*pixPerFrame;
             p.drawLine(QPointF(xTT, 0), QPointF(xTT, mFm.height() + 4));
+
             const QString drawValue = hasIn ? tr("In") : hasOut ? tr("Out") : getFrameMarkerText(i);
-            p.setPen(QPen(col, 0, Qt::SolidLine));
+            p.setPen(Qt::NoPen);
             const auto rect = QRectF(xTT + 1, 0,
                                      mFm.horizontalAdvance(drawValue) + 2,
                                      mFm.height());
@@ -163,18 +176,6 @@ void FrameScrollBar::paintEvent(QPaintEvent *) {
             p.drawText(rect, Qt::AlignCenter, drawValue);
         }
 
-        // draw in/out range
-        if (frameIn.first && frameOut.first) {
-            p.setPen(Qt::NoPen);
-            const qreal xTT1 = xT + (frameIn.second - mFrameRange.fMin) * pixPerFrame;
-            const qreal xTT2 = xT + (frameOut.second - mFrameRange.fMin) * pixPerFrame;
-            const int h = mFm.height() + 1;
-            const auto rect = QRectF(xTT1, h, xTT2 - xTT1, height() - h);
-            p.fillRect(rect, QBrush(ThemeSupport::getThemeColorGreen(40),
-                                    Qt::SolidPattern));
-            p.drawRect(rect);
-        }
-
         // draw minor
         p.setPen(QPen(Qt::darkGray, 2));
         for (int i = mMinFrame; i <= mMaxFrame; i += iInc) {