diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-05-22 08:18:01 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-05-22 08:18:01 +1000 |
| commit | c8235ba0e0292f209a8233613669e2cff8de80da (patch) | |
| tree | 117df121f92601300eeb2e9a047860384eb17d79 /src/EditView.h | |
| parent | 7f8a8cfb32aecb70fe10ef26fe096f4092f7e673 (diff) | |
| download | scintilla-mirror-c8235ba0e0292f209a8233613669e2cff8de80da.tar.gz | |
Rename ColourAlpha to ColourRGBA to avoid clashes when a ColourAlpha typedef
will be published in externally visible header.
Diffstat (limited to 'src/EditView.h')
| -rw-r--r-- | src/EditView.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/EditView.h b/src/EditView.h index bea42cbe9..f936a8a56 100644 --- a/src/EditView.h +++ b/src/EditView.h @@ -131,7 +131,7 @@ public: void DrawIndentGuide(Surface *surface, Sci::Line lineVisible, int lineHeight, XYPOSITION start, PRectangle rcSegment, bool highlight); void DrawEOL(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine, Sci::Line line, Sci::Position lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart, - std::optional<ColourAlpha> background); + std::optional<ColourRGBA> background); void DrawFoldDisplayText(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase); void DrawEOLAnnotationText(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, @@ -142,10 +142,10 @@ public: int xStart, PRectangle rcLine, int subLine) const; void DrawBackground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine, Range lineRange, Sci::Position posLineStart, int xStart, - int subLine, std::optional<ColourAlpha> background) const; + int subLine, std::optional<ColourRGBA> background) const; void DrawForeground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line lineVisible, PRectangle rcLine, Range lineRange, Sci::Position posLineStart, int xStart, - int subLine, std::optional<ColourAlpha> background); + int subLine, std::optional<ColourRGBA> background); void DrawIndentGuidesOverEmpty(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line, Sci::Line lineVisible, PRectangle rcLine, int xStart, int subLine); void DrawLine(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line, |