From c8235ba0e0292f209a8233613669e2cff8de80da Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 22 May 2021 08:18:01 +1000 Subject: Rename ColourAlpha to ColourRGBA to avoid clashes when a ColourAlpha typedef will be published in externally visible header. --- src/Indicator.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Indicator.h') diff --git a/src/Indicator.h b/src/Indicator.h index abceec061..11851476e 100644 --- a/src/Indicator.h +++ b/src/Indicator.h @@ -12,10 +12,10 @@ namespace Scintilla { struct StyleAndColour { int style; - ColourAlpha fore; + ColourRGBA fore; StyleAndColour() noexcept : style(INDIC_PLAIN), fore(0, 0, 0) { } - StyleAndColour(int style_, ColourAlpha fore_ = ColourAlpha(0, 0, 0)) noexcept : style(style_), fore(fore_) { + StyleAndColour(int style_, ColourRGBA fore_ = ColourRGBA(0, 0, 0)) noexcept : style(style_), fore(fore_) { } bool operator==(const StyleAndColour &other) const noexcept { return (style == other.style) && (fore == other.fore); @@ -36,7 +36,7 @@ public: XYPOSITION strokeWidth = 1.0f; Indicator() noexcept : under(false), fillAlpha(30), outlineAlpha(50), attributes(0) { } - Indicator(int style_, ColourAlpha fore_= ColourAlpha(0,0,0), bool under_=false, int fillAlpha_=30, int outlineAlpha_=50) noexcept : + Indicator(int style_, ColourRGBA fore_= ColourRGBA(0,0,0), bool under_=false, int fillAlpha_=30, int outlineAlpha_=50) noexcept : sacNormal(style_, fore_), sacHover(style_, fore_), under(under_), fillAlpha(fillAlpha_), outlineAlpha(outlineAlpha_), attributes(0) { } void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine, const PRectangle &rcCharacter, State drawState, int value) const; -- cgit v1.2.3