Skip to content

V
vlc-2-2
Commit ead6ddbb authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

Qt: QPalette: fix obsoleted values

parent 03f57178
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/gui/qt4/styles/seekstyle.cpp
View file @ ead6ddbb
...@@ -137,7 +137,7 @@ void SeekStyle::drawComplexControl( ComplexControl cc, const QStyleOptionComplex ...@@ -137,7 +137,7 @@ void SeekStyle::drawComplexControl( ComplexControl cc, const QStyleOptionComplex
/* draw chapters tickpoints */ /* draw chapters tickpoints */
if ( seekSlider->chapters && seekSlider->inputLength && groove.width() ) if ( seekSlider->chapters && seekSlider->inputLength && groove.width() )
{ {
QColor background = p.color( QPalette::Active, QPalette::Background ); QColor background = p.color( QPalette::Active, QPalette::Window );
QColor foreground = p.color( QPalette::Active, QPalette::WindowText ); QColor foreground = p.color( QPalette::Active, QPalette::WindowText );
foreground.setHsv( foreground.hue(), foreground.setHsv( foreground.hue(),
( background.saturation() + foreground.saturation() ) / 2, ( background.saturation() + foreground.saturation() ) / 2,
......
modules/gui/qt4/util/input_slider.cpp
View file @ ead6ddbb
...@@ -65,7 +65,7 @@ SeekSlider::SeekSlider( Qt::Orientation q, QWidget *_parent, bool _static ) ...@@ -65,7 +65,7 @@ SeekSlider::SeekSlider( Qt::Orientation q, QWidget *_parent, bool _static )
// prepare some static colors // prepare some static colors
QPalette p = palette(); QPalette p = palette();
QColor background = p.color( QPalette::Active, QPalette::Background ); QColor background = p.color( QPalette::Active, QPalette::Window );
tickpointForeground = p.color( QPalette::Active, QPalette::WindowText ); tickpointForeground = p.color( QPalette::Active, QPalette::WindowText );
tickpointForeground.setHsv( tickpointForeground.hue(), tickpointForeground.setHsv( tickpointForeground.hue(),
( background.saturation() + tickpointForeground.saturation() ) / 2, ( background.saturation() + tickpointForeground.saturation() ) / 2,
...@@ -469,7 +469,7 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, ...@@ -469,7 +469,7 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step,
for( int i = colorList.count(); i < 12; i++) for( int i = colorList.count(); i < 12; i++)
colorList.append( "255" ); colorList.append( "255" );
background = palette().color( QPalette::Active, QPalette::Background ); background = palette().color( QPalette::Active, QPalette::Window );
foreground = palette().color( QPalette::Active, QPalette::WindowText ); foreground = palette().color( QPalette::Active, QPalette::WindowText );
foreground.setHsv( foreground.hue(), foreground.setHsv( foreground.hue(),
( background.saturation() + foreground.saturation() ) / 2, ( background.saturation() + foreground.saturation() ) / 2,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment