Use QColor::darker/lighter instead of QColor::dark/light
Summary: QColor::dark() and QColor::light() are obsolete since long time ago. Reviewers: #kwin, apol Reviewed By: apol Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D22360
This commit is contained in:
parent
0be5bc45a7
commit
cccb3456f3
2 changed files with 6 additions and 6 deletions
|
@ -127,7 +127,7 @@ void DecorationPalette::update()
|
||||||
m_activeTitleBarColor = wmConfig.readEntry("activeBackground", m_palette.color(QPalette::Active, QPalette::Highlight));
|
m_activeTitleBarColor = wmConfig.readEntry("activeBackground", m_palette.color(QPalette::Active, QPalette::Highlight));
|
||||||
m_inactiveTitleBarColor = wmConfig.readEntry("inactiveBackground", m_inactiveFrameColor);
|
m_inactiveTitleBarColor = wmConfig.readEntry("inactiveBackground", m_inactiveFrameColor);
|
||||||
m_activeForegroundColor = wmConfig.readEntry("activeForeground", m_palette.color(QPalette::Active, QPalette::HighlightedText));
|
m_activeForegroundColor = wmConfig.readEntry("activeForeground", m_palette.color(QPalette::Active, QPalette::HighlightedText));
|
||||||
m_inactiveForegroundColor = wmConfig.readEntry("inactiveForeground", m_activeForegroundColor.dark());
|
m_inactiveForegroundColor = wmConfig.readEntry("inactiveForeground", m_activeForegroundColor.darker());
|
||||||
|
|
||||||
KConfigGroup windowColorsConfig(config, QStringLiteral("Colors:Window"));
|
KConfigGroup windowColorsConfig(config, QStringLiteral("Colors:Window"));
|
||||||
m_warningForegroundColor = windowColorsConfig.readEntry("ForegroundNegative", QColor(237, 21, 2));
|
m_warningForegroundColor = windowColorsConfig.readEntry("ForegroundNegative", QColor(237, 21, 2));
|
||||||
|
|
|
@ -43,12 +43,12 @@ void ColorSettings::init(const QPalette &pal)
|
||||||
m_inactiveFrameColor = wmConfig.readEntry("inactiveFrame", m_activeFrameColor);
|
m_inactiveFrameColor = wmConfig.readEntry("inactiveFrame", m_activeFrameColor);
|
||||||
m_activeTitleBarColor = wmConfig.readEntry("activeBackground", pal.color(QPalette::Active, QPalette::Highlight));
|
m_activeTitleBarColor = wmConfig.readEntry("activeBackground", pal.color(QPalette::Active, QPalette::Highlight));
|
||||||
m_inactiveTitleBarColor = wmConfig.readEntry("inactiveBackground", m_inactiveFrameColor);
|
m_inactiveTitleBarColor = wmConfig.readEntry("inactiveBackground", m_inactiveFrameColor);
|
||||||
m_activeTitleBarBlendColor = wmConfig.readEntry("activeBlend", m_activeTitleBarColor.dark(110));
|
m_activeTitleBarBlendColor = wmConfig.readEntry("activeBlend", m_activeTitleBarColor.darker(110));
|
||||||
m_inactiveTitleBarBlendColor = wmConfig.readEntry("inactiveBlend", m_inactiveTitleBarColor.dark(110));
|
m_inactiveTitleBarBlendColor = wmConfig.readEntry("inactiveBlend", m_inactiveTitleBarColor.darker(110));
|
||||||
m_activeFontColor = wmConfig.readEntry("activeForeground", pal.color(QPalette::Active, QPalette::HighlightedText));
|
m_activeFontColor = wmConfig.readEntry("activeForeground", pal.color(QPalette::Active, QPalette::HighlightedText));
|
||||||
m_inactiveFontColor = wmConfig.readEntry("inactiveForeground", m_activeFontColor.dark());
|
m_inactiveFontColor = wmConfig.readEntry("inactiveForeground", m_activeFontColor.darker());
|
||||||
m_activeButtonColor = wmConfig.readEntry("activeTitleBtnBg", m_activeFrameColor.light(130));
|
m_activeButtonColor = wmConfig.readEntry("activeTitleBtnBg", m_activeFrameColor.lighter(130));
|
||||||
m_inactiveButtonColor = wmConfig.readEntry("inactiveTitleBtnBg", m_inactiveFrameColor.light(130));
|
m_inactiveButtonColor = wmConfig.readEntry("inactiveTitleBtnBg", m_inactiveFrameColor.lighter(130));
|
||||||
m_activeHandle = wmConfig.readEntry("handle", m_activeFrameColor);
|
m_activeHandle = wmConfig.readEntry("handle", m_activeFrameColor);
|
||||||
m_inactiveHandle = wmConfig.readEntry("inactiveHandle", m_activeHandle);
|
m_inactiveHandle = wmConfig.readEntry("inactiveHandle", m_activeHandle);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue