From 81f7847af4cc9f51f02ab191c73f394c457518bd Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 25 Apr 2021 09:52:20 +1000 Subject: Feature [feature-requests:#1402]. Unify colour type with ColourAlpha. Change ColourDesired to ColourAlpha in styles. Remove ColourDesired. --- src/EditView.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/EditView.h') diff --git a/src/EditView.h b/src/EditView.h index 91a925f4a..add58065b 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, - ColourOptional background); + std::optional 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, ColourOptional background) const; + int subLine, std::optional 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, ColourOptional background); + int subLine, std::optional 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, -- cgit v1.2.3