diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinecontrols.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinecontrols.cpp index f0b58d91c98..21f5af9eff4 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinecontrols.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinecontrols.cpp @@ -63,7 +63,7 @@ FloatControl::FloatControl() setMinimum(std::numeric_limits::lowest()); setMaximum(std::numeric_limits::max()); - QColor bg = Theme::instance()->qmlDesignerBackgroundColorDarkAlternate(); + QColor bg = Theme::getColor(Theme::DScontrolBackground); auto p = palette(); p.setColor(QPalette::Text, Theme::instance()->color(Utils::Theme::PanelTextColorLight)); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineplaceholder.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineplaceholder.cpp index 7e7cb69fc97..afcc448115c 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineplaceholder.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineplaceholder.cpp @@ -51,9 +51,8 @@ TimelinePlaceholder *TimelinePlaceholder::create(QGraphicsScene * /*parentScene* void TimelinePlaceholder::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) { painter->save(); - static const QColor penColor = Theme::instance()->qmlDesignerBackgroundColorDarker(); - static const QColor backgroundColor = Theme::instance() - ->qmlDesignerBackgroundColorDarkAlternate(); + static const QColor penColor = Theme::getColor(Theme::BackgroundColorDark); + static const QColor backgroundColor = Theme::getColor(Theme::DScontrolBackground); static const QColor backgroundColorSection = Theme::getColor(Theme::BackgroundColorDark); painter->fillRect(0, 0, size().width(), size().height(), backgroundColor); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp index 9aef430dea6..fa1d258c28a 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp @@ -368,10 +368,9 @@ void TimelinePropertyItem::paint(QPainter *painter, const QStyleOptionGraphicsIt { painter->save(); - static const QColor penColor = Theme::instance()->qmlDesignerBackgroundColorDarker(); + static const QColor penColor = Theme::getColor(Theme::BackgroundColorDark); static const QColor textColor = Theme::getColor(Theme::PanelTextColorLight); - static const QColor backgroundColor = Theme::instance() - ->qmlDesignerBackgroundColorDarkAlternate(); + static const QColor backgroundColor = Theme::getColor(Theme::DScontrolBackground); static const QPixmap keyframe = TimelineIcons::KEYFRAME.pixmap(); static const QPixmap isKeyframe = TimelineIcons::IS_KEYFRAME.pixmap(); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp index 1cff8012353..9176e6ef9d1 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp @@ -255,7 +255,7 @@ void TimelineSectionItem::paint(QPainter *painter, painter->save(); const QColor textColor = Theme::getColor(Theme::PanelTextColorLight); - const QColor penColor = Theme::instance()->qmlDesignerBackgroundColorDarker(); + const QColor penColor = Theme::getColor(Theme::BackgroundColorDark); QColor brushColor = Theme::getColor(Theme::BackgroundColorDark); int fillOffset = 0; @@ -273,7 +273,7 @@ void TimelineSectionItem::paint(QPainter *painter, 0, size().width() - TimelineConstants::sectionWidth, size().height(), - Theme::instance()->qmlDesignerBackgroundColorDarkAlternate()); + Theme::getColor(Theme::DScontrolBackground)); painter->setPen(penColor); drawLine(painter, @@ -640,8 +640,7 @@ qreal TimelineRulerSectionItem::endFrame() const void TimelineRulerSectionItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) { - static const QColor backgroundColor = Theme::instance() - ->qmlDesignerBackgroundColorDarkAlternate(); + static const QColor backgroundColor = Theme::getColor(Theme::DScontrolBackground); static const QColor penColor = Theme::getColor(Theme::PanelTextColorLight); static const QColor highlightColor = Theme::instance()->Theme::qmlDesignerButtonColor(); static const QColor handleColor = Theme::getColor(Theme::QmlDesigner_HighlightColor); diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorpropertyitem.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorpropertyitem.cpp index f5b7b45b05e..7e5555100ea 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorpropertyitem.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorpropertyitem.cpp @@ -121,10 +121,9 @@ void TransitionEditorPropertyItem::paint(QPainter *painter, { painter->save(); - static const QColor penColor = Theme::instance()->qmlDesignerBackgroundColorDarker(); + static const QColor penColor = Theme::getColor(Theme::BackgroundColorDark); static const QColor textColor = Theme::getColor(Theme::PanelTextColorLight); - static const QColor backgroundColor = Theme::instance() - ->qmlDesignerBackgroundColorDarkAlternate(); + static const QColor backgroundColor = Theme::getColor(Theme::DScontrolBackground); painter->fillRect(0, 0, TimelineConstants::sectionWidth, size().height(), backgroundColor); painter->fillRect(TimelineConstants::textIndentationProperties - 4, diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp index 7172465e0d5..7206a73b35f 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp @@ -302,8 +302,8 @@ void TransitionEditorSectionItem::paint(QPainter *painter, painter->save(); const QColor textColor = Theme::getColor(Theme::PanelTextColorLight); - const QColor penColor = Theme::instance()->qmlDesignerBackgroundColorDarker(); - QColor brushColor = Theme::getColor(Theme::BackgroundColorDark); + const QColor penColor = Theme::getColor(Theme::BackgroundColorDark); + QColor brushColor = Theme::getColor(Theme::DScontrolBackground); int fillOffset = 0; if (isSelected()) { @@ -320,7 +320,7 @@ void TransitionEditorSectionItem::paint(QPainter *painter, 0, size().width() - TimelineConstants::sectionWidth, size().height(), - Theme::instance()->qmlDesignerBackgroundColorDarkAlternate()); + Theme::getColor(Theme::DScontrolBackground)); painter->setPen(penColor); drawLine(painter,