1
0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 13:58:49 +00:00

Split out the check for accent color luminance.

This commit is contained in:
wolfbeast
2017-07-19 16:24:08 +02:00
committed by Roy Tam
parent e9ce84445e
commit 41ee5136f4
2 changed files with 20 additions and 8 deletions
+12 -8
View File
@@ -762,6 +762,16 @@ nsLookAndFeel::GetAccentColor(nscolor& aColor)
return rv;
}
bool
nsLookAndFeel::AccentColorIsDark(nscolor aColor)
{
float luminance = (NS_GET_R(aColor) * 2 +
NS_GET_G(aColor) * 5 +
NS_GET_B(aColor)) / 8;
return luminance <= 128;
}
/* static */ nsresult
nsLookAndFeel::GetAccentColorText(nscolor& aColor)
{
@@ -775,15 +785,9 @@ nsLookAndFeel::GetAccentColorText(nscolor& aColor)
// a background that has the accent color to have good contrast with
// the accent color. Windows itself uses either white or black text
// depending on how light or dark the accent color is. We do the same
// here based on the luminance of the accent color with a threshhold
// value and formula that are specified in the UWP guidelines.
// See: https://docs.microsoft.com/en-us/windows/uwp/style/color
// here based on the luminance of the accent color.
float luminance = (NS_GET_R(accentColor) * 2 +
NS_GET_G(accentColor) * 5 +
NS_GET_B(accentColor)) / 8;
aColor = (luminance <= 128) ? NS_RGB(255, 255, 255) : NS_RGB(0, 0, 0);
aColor = AccentColorIsDark(accentColor) ? NS_RGB(255, 255, 255) : NS_RGB(0, 0, 0);
return NS_OK;
}
+8
View File
@@ -67,6 +67,14 @@ private:
*/
nsresult GetAccentColor(nscolor& aColor);
/**
* Determines whether the Windows accent color is considered dark
* with a threshhold value and formula that are specified in the
* UWP guidelines.
* See: https://docs.microsoft.com/en-us/windows/uwp/style/color
*/
bool AccentColorIsDark(nscolor aColor);
/**
* If the Windows accent color from the Windows settings is set
* to apply to the title bar, this computes the color that should