From 630950299320cbd0f7ed8075cc6db01596c4ac34 Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Tue, 19 Oct 2021 19:41:33 +0100
Subject: [PATCH] Make sure scroll bars markers use correct color

---
 app/widget/resizablescrollbar/resizabletimelinescrollbar.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/widget/resizablescrollbar/resizabletimelinescrollbar.cpp b/app/widget/resizablescrollbar/resizabletimelinescrollbar.cpp
index f928779bf..e45b3d1fc 100644
--- a/app/widget/resizablescrollbar/resizabletimelinescrollbar.cpp
+++ b/app/widget/resizablescrollbar/resizabletimelinescrollbar.cpp
@@ -25,6 +25,8 @@
 #include <QStyleOptionSlider>
 #include <QtMath>
 
+#include "ui/colorcoding.h"
+
 namespace olive {
 
 ResizableTimelineScrollBar::ResizableTimelineScrollBar(QWidget* parent) :
@@ -109,8 +111,8 @@ void ResizableTimelineScrollBar::paintEvent(QPaintEvent *event)
     }
 
     if (!points_->markers()->list().isEmpty()) {
-      QColor marker_color(0, 255, 0, 128);
       foreach (TimelineMarker* marker, points_->markers()->list()) {
+        QColor marker_color = ColorCoding::GetColor(marker->color()).toQColor();
         int64_t in = qRound64(ratio * TimeToScene(marker->time().in()));
         int64_t out = qRound64(ratio * TimeToScene(marker->time().out()));
         int64_t length = qMax(int64_t(1), out-in);