From cc9de3791859538441fc5a174c69f556638cce03 Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Wed, 13 Jun 2018 10:17:50 +0300 Subject: Fix mediaplayer slider color definitions Task-number: QTBUG-62791 Change-Id: I1d9547680adbed937ee3b5e413c9c2f76304af28 Reviewed-by: Kimmo Ollila --- basicsuite/mediaplayer/PlayerSlider.qml | 6 +++--- basicsuite/mediaplayer/mediaplayer.pro | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/basicsuite/mediaplayer/PlayerSlider.qml b/basicsuite/mediaplayer/PlayerSlider.qml index ef0556a..68c21e1 100644 --- a/basicsuite/mediaplayer/PlayerSlider.qml +++ b/basicsuite/mediaplayer/PlayerSlider.qml @@ -82,7 +82,7 @@ Item { width: slider.width anchors.verticalCenter: slider.verticalCenter height: 5 - color: "red" //Settings.backgroundColor + color: Settings.primaryGrey radius: 2 MouseArea { @@ -120,7 +120,7 @@ Item { anchors.right: handle.right anchors.rightMargin: handle.width / 2 visible: slider.enabled - color: "green" + color: "white" radius: 2 } @@ -129,7 +129,7 @@ Item { width: 40 height: width radius: width / 2 - color: "#41cd52" + color: Settings.primaryGreen antialiasing: true anchors.centerIn: handle visible: true diff --git a/basicsuite/mediaplayer/mediaplayer.pro b/basicsuite/mediaplayer/mediaplayer.pro index 3578abc..1487620 100644 --- a/basicsuite/mediaplayer/mediaplayer.pro +++ b/basicsuite/mediaplayer/mediaplayer.pro @@ -15,6 +15,7 @@ content.files = \ MetadataView.qml \ ParameterPanel.qml \ PlaybackControl.qml \ + PlayerSlider.qml \ SeekControl.qml \ UrlBar.qml \ VolumeControl.qml \ -- cgit v1.2.3