vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed useless colorCacheInvalid_ member 

svn path=/trunk/KDE/kdebase/workspace/; revision=1034964
icc-effect-5.14.5
Hugo Pereira Da Costa 2009-10-14 02:55:40 +00:00
parent bd80aaceb1
commit cef60f90cb
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/oxygen/oxygenbutton.cpp
View File

@ -48,7 +48,6 @@ namespace Oxygen
client_(parent),
helper_( parent.helper() ),
type_(type),
colorCacheInvalid_(true),
timeLine_( 200, this )
{
setAutoFillBackground(false);
@ -93,14 +92,13 @@ namespace Oxygen
if( active ) return palette.color(QPalette::Active, QPalette::ButtonText);
else {
if (colorCacheInvalid_)
if( !cachedButtonDetailColor_.isValid() )
{
QColor ab = palette.color(QPalette::Active, QPalette::Button);
QColor af = palette.color(QPalette::Active, QPalette::ButtonText);
QColor nb = palette.color(QPalette::Inactive, QPalette::Button);
QColor nf = palette.color(QPalette::Inactive, QPalette::ButtonText);
colorCacheInvalid_ = false;
cachedButtonDetailColor_ = reduceContrast(nb, nf, qMax(qreal(2.5), KColorUtils::contrastRatio(ab, KColorUtils::mix(ab, af, 0.4))));
}

2
clients/oxygen/oxygenbutton.h
View File

@ -119,7 +119,7 @@ namespace Oxygen
//! button status
ButtonState status_;
bool colorCacheInvalid_;
// button color
QColor cachedButtonDetailColor_;
//! timeline used for smooth transitions