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 /cocoa/PlatCocoa.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 'cocoa/PlatCocoa.h')
| -rw-r--r-- | cocoa/PlatCocoa.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index 70a9b68f1..29c908baa 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -56,9 +56,9 @@ private: int bitmapHeight; /** Set the CGContext's fill colour to the specified desired colour. */ - void FillColour(ColourAlpha fill); + void FillColour(ColourRGBA fill); - void PenColourAlpha(ColourAlpha fore); + void PenColourAlpha(ColourRGBA fore); void SetFillStroke(FillStroke fillStroke); @@ -111,19 +111,19 @@ public: void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource) override; std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override; - void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, - ColourAlpha back) override; - void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, - ColourAlpha back) override; - void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore) override; + void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, + ColourRGBA back) override; + void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, + ColourRGBA back) override; + void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override; void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) override; XYPOSITION WidthText(const Font *font_, std::string_view text) override; - void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, - ColourAlpha back) override; - void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, - ColourAlpha back) override; - void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore) override; + void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, + ColourRGBA back) override; + void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, + ColourRGBA back) override; + void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override; void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) override; XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) override; |