diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-04-25 09:52:20 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-04-25 09:52:20 +1000 |
| commit | 81f7847af4cc9f51f02ab191c73f394c457518bd (patch) | |
| tree | ef214ea786c00e9618756c26b99299ac1fa58bf6 /src/Style.cxx | |
| parent | 241f33a38ca0887d1a47399de1bcf7ba0d544c41 (diff) | |
| download | scintilla-mirror-81f7847af4cc9f51f02ab191c73f394c457518bd.tar.gz | |
Feature [feature-requests:#1402]. Unify colour type with ColourAlpha.
Change ColourDesired to ColourAlpha in styles.
Remove ColourDesired.
Diffstat (limited to 'src/Style.cxx')
| -rw-r--r-- | src/Style.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Style.cxx b/src/Style.cxx index 83224c736..ae5fa6aa3 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -59,13 +59,13 @@ void FontMeasurements::ClearMeasurements() noexcept { } Style::Style() : FontSpecification() { - Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), + Clear(ColourAlpha(0, 0, 0), ColourAlpha(0xff, 0xff, 0xff), Platform::DefaultFontSize() * SC_FONT_SIZE_MULTIPLIER, nullptr, SC_CHARSET_DEFAULT, SC_WEIGHT_NORMAL, false, false, false, CaseForce::mixed, true, true, false); } Style::Style(const Style &source) noexcept : FontSpecification(), FontMeasurements() { - Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), + Clear(ColourAlpha(0, 0, 0), ColourAlpha(0xff, 0xff, 0xff), 0, nullptr, 0, SC_WEIGHT_NORMAL, false, false, false, CaseForce::mixed, true, true, false); fore = source.fore; @@ -89,7 +89,7 @@ Style::~Style() { Style &Style::operator=(const Style &source) noexcept { if (this == &source) return * this; - Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), + Clear(ColourAlpha(0, 0, 0), ColourAlpha(0xff, 0xff, 0xff), 0, nullptr, SC_CHARSET_DEFAULT, SC_WEIGHT_NORMAL, false, false, false, CaseForce::mixed, true, true, false); fore = source.fore; @@ -107,7 +107,7 @@ Style &Style::operator=(const Style &source) noexcept { return *this; } -void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_, +void Style::Clear(ColourAlpha fore_, ColourAlpha back_, int size_, const char *fontName_, int characterSet_, int weight_, bool italic_, bool eolFilled_, bool underline_, CaseForce caseForce_, |