From 264a747f148e7e321f5d9ade320d85b53b1cebe7 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 6 Mar 2015 23:43:47 +0100 Subject: [PATCH] Moved SeekSlider foreground color to TomahawkStyle. --- src/libtomahawk/utils/TomahawkStyle.h | 2 ++ src/libtomahawk/widgets/SeekSlider.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/utils/TomahawkStyle.h b/src/libtomahawk/utils/TomahawkStyle.h index e16b34d49..e6151c4e4 100644 --- a/src/libtomahawk/utils/TomahawkStyle.h +++ b/src/libtomahawk/utils/TomahawkStyle.h @@ -98,6 +98,8 @@ namespace TomahawkStyle static const QColor SLIDESWITCH_UNCHECKED_BOTTOM = QColor( 179, 179, 179 ); static const QColor SLIDESWITCH_TEXT = QColor( "#606060" ); + static const QColor SEEKSLIDER_FOREGROUND = QColor( "#ffffff" ); + static const int POPUP_ROUNDING_RADIUS = 6; static const float POPUP_OPACITY = 0.93; } diff --git a/src/libtomahawk/widgets/SeekSlider.cpp b/src/libtomahawk/widgets/SeekSlider.cpp index 32427c5ca..6846f3ad4 100644 --- a/src/libtomahawk/widgets/SeekSlider.cpp +++ b/src/libtomahawk/widgets/SeekSlider.cpp @@ -24,6 +24,7 @@ #include #include "utils/TomahawkUtils.h" +#include "utils/TomahawkStyle.h" #include "utils/Logger.h" @@ -40,7 +41,7 @@ SeekSlider::SeekSlider( QWidget* parent ) "}" "QSlider::sub-page:horizontal {" - "margin-top: %1px; margin-bottom: %1px; border: %2px solid rgba(0, 0, 0, 0); background: #ffffff;" + "margin-top: %1px; margin-bottom: %1px; border: %2px solid rgba(0, 0, 0, 0); background: %5;" // "border-image: url(" RESPATH "images/seek-slider-level.png) %2 %2 %2 %2 stretch stretch;" "}" ) .arg( scaledX( 7 ) /*margin*/) @@ -56,7 +57,8 @@ SeekSlider::SeekSlider( QWidget* parent ) .arg( /*margin top&bottom*/ 0 ) .arg( /*margin left&right*/ 0 ) .arg( /*height*/ 0 ) - .arg( /*width*/ 0 ) ); + .arg( /*width*/ 0 ) + .arg( /*color*/ TomahawkStyle::SEEKSLIDER_FOREGROUND.name() ) ); }