diff --git a/src/plugins/qmldesigner/components/timelineeditor/canvasstyledialog.h b/src/plugins/qmldesigner/components/timelineeditor/canvasstyledialog.h index b3b1a86c956..4fd7e77c270 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/canvasstyledialog.h +++ b/src/plugins/qmldesigner/components/timelineeditor/canvasstyledialog.h @@ -27,6 +27,8 @@ #include "timelinecontrols.h" +#include + #include #include @@ -41,14 +43,14 @@ struct CanvasStyle qreal thinLineWidth = 0.3; qreal thickLineWidth = 2.5; - QColor thinLineColor = qRgb(0x99, 0x99, 0x99); - QColor thickLineColor = qRgb(0x5f, 0x5f, 0x5f); + QColor thinLineColor = Theme::getColor(Theme::DSscrollBarHandle); + QColor thickLineColor = Theme::getColor(Theme::DSscrollBarHandle); qreal handleSize = 7.0; qreal handleLineWidth = 2.0; - QColor endPointColor = qRgb(0xd6, 0xd3, 0x51); - QColor interPointColor = qRgb(0xce, 0x17, 0x17); + QColor endPointColor = Theme::getColor(Theme::IconsWarningToolBarColor); + QColor interPointColor = Theme::getColor(Theme::DSerrorColor); qreal curveWidth = 3.0; }; diff --git a/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp b/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp index 3431e5c7a7a..40ca4ec7add 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp @@ -91,21 +91,18 @@ void SplineEditor::paintEvent(QPaintEvent *) { QPainter painter(this); - QPen pen(Qt::black); + QPen pen(Theme::getColor(Theme::DScontrolOutline)); pen.setWidth(1); painter.drawRect(0, 0, width() - 1, height() - 1); painter.setRenderHint(QPainter::Antialiasing); - pen = QPen(Qt::darkGray); - pen.setWidth(1); - painter.setPen(pen); - - QColor curveColor = Qt::white; + QColor curveColor = Theme::getColor(Theme::PanelTextColorLight); if (!m_curve.isLegal()) - curveColor = Qt::red; + curveColor = Theme::getColor(Theme::DSerrorColor); + + QBrush background(Theme::getColor(Theme::BackgroundColorDark)); - QBrush background(Theme::instance()->qmlDesignerBackgroundColorDarker()); m_canvas.paintGrid(&painter, background); m_canvas.paintCurve(&painter, m_curve, curveColor); m_canvas.paintControlPoints(&painter, m_curve);