yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only define Shadow in scope where it is used.

Browse source
This commit is contained in:
Hugo Pereira Da Costa 2011-09-16 18:26:30 +02:00
parent a05eecf4f0
commit 4732070efa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/oxygen/oxygenbutton.cpp
View file

@ -250,9 +250,6 @@ namespace Oxygen
_helper.viewNegativeTextBrush().brush(palette).color(): _helper.viewNegativeTextBrush().brush(palette).color():
_helper.viewHoverBrush().brush(palette).color(); _helper.viewHoverBrush().brush(palette).color();
// shadow color
QColor shadow = _helper.calcShadowColor( base );
// decide decoration color // decide decoration color
if( isAnimated() ) color = KColorUtils::mix( color, glow, glowIntensity() ); if( isAnimated() ) color = KColorUtils::mix( color, glow, glowIntensity() );
else if( _status == Oxygen::Hovered ) color = glow; else if( _status == Oxygen::Hovered ) color = glow;
@ -260,6 +257,9 @@ namespace Oxygen
if( hasDecoration() ) if( hasDecoration() )
{ {
// shadow color
QColor shadow = _helper.calcShadowColor( base );
// decide shadow color // decide shadow color
if( isAnimated() ) shadow = KColorUtils::mix( shadow, glow, glowIntensity() ); if( isAnimated() ) shadow = KColorUtils::mix( shadow, glow, glowIntensity() );
else if( _status == Oxygen::Hovered ) shadow = glow; else if( _status == Oxygen::Hovered ) shadow = glow;