background uses independent contrast (but for now no way to set it different than system contrast)

TODO: read setting from the config (and make sure we are provided good config)

svn path=/trunk/KDE/kdebase/workspace/; revision=695366
icc-effect-5.14.5
Matthew Woehlke 2007-08-01 22:55:37 +00:00
parent adbaf73610
commit da7bff08ec
2 changed files with 5 additions and 3 deletions

View File

@ -55,6 +55,7 @@ OxygenHelper::OxygenHelper(const QByteArray &componentName)
{
_config = _componentData.config();
_contrast = KGlobalSettings::contrastF(_config);
_bgcontrast = _contrast; // TODO get style setting
m_backgroundCache.setMaxCost(64);
m_roundCache.setMaxCost(64);
@ -76,7 +77,7 @@ QColor OxygenHelper::backgroundRadialColor(const QColor &color) const
if (lowThreshold(color))
return KColorScheme::shade(color, KColorScheme::LightShade, 0.0);
else
return KColorScheme::shade(color, KColorScheme::LightShade, _contrast);
return KColorScheme::shade(color, KColorScheme::LightShade, _bgcontrast);
}
QColor OxygenHelper::backgroundTopColor(const QColor &color) const
@ -84,7 +85,7 @@ QColor OxygenHelper::backgroundTopColor(const QColor &color) const
if (lowThreshold(color))
return KColorScheme::shade(color, KColorScheme::MidlightShade, 0.0);
else
return KColorScheme::shade(color, KColorScheme::MidlightShade, _contrast);
return KColorScheme::shade(color, KColorScheme::MidlightShade, _bgcontrast);
}
QColor OxygenHelper::backgroundBottomColor(const QColor &color) const
@ -92,7 +93,7 @@ QColor OxygenHelper::backgroundBottomColor(const QColor &color) const
if (lowThreshold(color))
return KColorScheme::shade(color, KColorScheme::MidShade, 0.0);
else
return KColorScheme::shade(color, KColorScheme::MidShade, _contrast - 1.1);
return KColorScheme::shade(color, KColorScheme::MidShade, _bgcontrast - 1.1);
}
QColor OxygenHelper::calcLightColor(const QColor &color)

View File

@ -57,6 +57,7 @@ protected:
KComponentData _componentData;
KSharedConfigPtr _config;
qreal _contrast;
qreal _bgcontrast;
QCache<quint64, QPixmap> m_backgroundCache;
QCache<quint64, QPixmap> m_roundCache;