maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

private

Browse source
This commit is contained in:
Pankaj Bhojwani 2021-09-02 16:04:35 -07:00
parent 12e8d6c958
commit 384bf498f1
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cascadia/TerminalCore/ColorFix.cpp
View file

@ -259,7 +259,7 @@ ColorFix::ColorFix()
ColorFix::ColorFix(COLORREF color)
{
rgb = color;
ToLab();
_ToLab();
}
ColorFix::ColorFix(double l, double a, double b)
@ -267,7 +267,7 @@ ColorFix::ColorFix(double l, double a, double b)
L = l;
A = a;
B = b;
ToRGB();
_ToRGB();
}
ColorFix::ColorFix(const ColorFix& color)
@ -282,7 +282,7 @@ ColorFix::ColorFix(const ColorFix& color)
// - Populates our L, A, B values, based on our r, g, b values
// - Converts a color in rgb format to a color in lab format
// - Reference: http://www.easyrgb.com/index.php?X=MATH&H=01#text1
void ColorFix::ToLab()
void ColorFix::_ToLab()
{
//dE00::RGBToLAB(r, g, b, L, A, B);
double var_R = r / 255.0;
@ -337,7 +337,7 @@ void ColorFix::ToLab()
// - Populates our r, g, b values, based on our L, A, B values
// - Converts a color in lab format to a color in rgb format
// - Reference: http://www.easyrgb.com/index.php?X=MATH&H=01#text1
void ColorFix::ToRGB()
void ColorFix::_ToRGB()
{
double var_Y = (L + 16.) / 116.;
double var_X = A / 500. + var_Y;
@ -399,7 +399,7 @@ double ColorFix::DeltaE(ColorFix color)
}
// Method Description:
// - Given a background color, change our own color to make it more perceivable if necessary
// - Given a background color, change the foreground color to make it more perceivable if necessary
// - Arguments:
// - back: the color to compare against
// - pColor: where to store the resulting color
@ -439,7 +439,7 @@ bool ColorFix::PerceivableColor(COLORREF back, ColorFix& pColor, double* oldDE,
}
wrap:
if (bChanged)
pColor.ToRGB();
pColor._ToRGB();
else
pColor = *this;
return bChanged;

5
src/cascadia/TerminalCore/ColorFix.hpp
View file

@ -14,9 +14,6 @@ public:
ColorFix(double l, double a, double b);
ColorFix(const ColorFix& color);
void ToLab();
void ToRGB();
double DeltaE(ColorFix color);
bool PerceivableColor(COLORREF back, ColorFix& pColor, double* oldDE = NULL, double* newDE = NULL);
@ -38,6 +35,8 @@ public:
};
private:
void _ToLab();
void _ToRGB();
BYTE _Clamp(double v);
};